[Trunk | Admin]:

1. domain/page.ts: Add "communities" field (now "connect" is used for connect general pages - not community specific).
2. page-form.component: Add  form control and checkbox for "communities" field of a Page.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@56176 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2019-06-24 10:34:19 +00:00
parent fd0adb7682
commit f772aff832
5 changed files with 18 additions and 7 deletions

View File

@ -7,6 +7,7 @@ export interface Page {
type: string; type: string;
isEnabled: boolean; isEnabled: boolean;
connect: boolean; connect: boolean;
communities: boolean;
openaire: boolean; openaire: boolean;
entities: Entity[] | string[]; entities: Entity[] | string[];
} }

View File

@ -61,5 +61,13 @@
</label> </label>
</div> </div>
<div class="form-group uk-grid uk-margin-remove-top">
<label class="uk-width-2-3">Select if this page exists in connect portals (community specific)</label>
<label class="uk-width-1-3 checkbox">
<span style="font-weight: normal;">communities</span>
<input tabindex="0" type="checkbox" formControlName="communities">
</label>
</div>
<input type="hidden" formControlName="_id"> <input type="hidden" formControlName="_id">
</form> </form>

View File

@ -105,7 +105,8 @@ export class PageFormComponent implements OnInit{
name : ['', Validators.required], name : ['', Validators.required],
isEnabled: '', isEnabled: '',
openaire: true, openaire: true,
connect: true, connect: false,
communities: true,
type: ['', Validators.required], type: ['', Validators.required],
entities: this._fb.array([]), entities: this._fb.array([]),
_id : '', _id : '',
@ -120,7 +121,8 @@ export class PageFormComponent implements OnInit{
type: '', type: '',
isEnabled: '', isEnabled: '',
openaire: true, openaire: true,
connect: true, connect: false,
communities: true,
_id : '', _id : '',
isCollapsed: [true] isCollapsed: [true]
}); });

View File

@ -98,11 +98,11 @@ export class PagesComponent implements OnInit {
this._helpContentService.getCommunityPages(community_pid, parameters, this.properties.adminToolsAPIURL).subscribe( this._helpContentService.getCommunityPages(community_pid, parameters, this.properties.adminToolsAPIURL).subscribe(
pages => { pages => {
this.pagesReturned(pages); this.pagesReturned(pages);
if(!this.pagesType || this.pagesType == "link") { //if(!this.pagesType || this.pagesType == "link") {
this.getPagesWithDivIds(community_pid); this.getPagesWithDivIds(community_pid);
} else { //} else {
this.showLoading = false; //this.showLoading = false;
} //}
}, },
error => this.handleError('System error retrieving pages', error) error => this.handleError('System error retrieving pages', error)
); );

View File

@ -53,7 +53,7 @@
"cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=", "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
"adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools/", "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
"adminToolsCommunity" :"openaire", "adminToolsCommunity" :"openaire",
"communityAPI": "https://dev-openaire.d4science.org/openaire/community/", "communityAPI": "https://dev-openaire.d4science.org/openaire/community/",