MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

Landing pages: loading message for basic information - small bug fixed (do not show loading when warning message is active) 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@47698 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2017-06-26 12:42:13 +00:00
parent fadf75e5f4
commit 46e1657731
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts
View File

@ -120,6 +120,7 @@ export class DataProviderComponent {
this.showTabs = false ; this.showTabs = false ;
if(this.datasourceId==null || this.datasourceId==''){ if(this.datasourceId==null || this.datasourceId==''){
this.showLoading = false;
this.warningMessage="No valid datasource id"; this.warningMessage="No valid datasource id";
}else{ }else{
this._dataproviderService.getDataproviderInfo(this.datasourceId).subscribe( this._dataproviderService.getDataproviderInfo(this.datasourceId).subscribe(

1
portal-2/src/app/landingPages/dataset/dataset.component.ts
View File

@ -64,6 +64,7 @@ export class DatasetComponent {
if(this.datasetId){ if(this.datasetId){
this.getDatasetInfo(this.datasetId); this.getDatasetInfo(this.datasetId);
}else{ }else{
this.showLoading = false;
this.warningMessage="No valid dataset id"; this.warningMessage="No valid dataset id";
} }

1
portal-2/src/app/landingPages/organization/organization.component.ts
View File

@ -95,6 +95,7 @@ export class OrganizationComponent {
if(this.organizationId){ if(this.organizationId){
this.getOrganizationInfo(); this.getOrganizationInfo();
}else{ }else{
this.showLoading = false;
this.warningMessage="No valid organization id"; this.warningMessage="No valid organization id";
} }

1
portal-2/src/app/landingPages/project/project.component.ts
View File

@ -111,6 +111,7 @@ export class ProjectComponent{
this.searchPublications(); this.searchPublications();
this.fetchDatasets.getNumForEntity("project", this.projectId); this.fetchDatasets.getNumForEntity("project", this.projectId);
}else{ }else{
this.showLoading = false;
this.warningMessage="No valid project id"; this.warningMessage="No valid project id";
} }

1
portal-2/src/app/landingPages/publication/publication.component.ts
View File

@ -76,6 +76,7 @@ export class PublicationComponent {
// switcher(UIkit); // switcher(UIkit);
// } // }
}else{ }else{
this.showLoading = false;
this.warningMessage="No valid publication id"; this.warningMessage="No valid publication id";
} }
this.metricsClicked = false; this.metricsClicked = false;