diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html index 487ec77e1..8fdc3b09d 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html @@ -1,12 +1,12 @@
-
+

{{ data.message }}

+ type="button">attach_file
diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html index 6333952cb..4f3b0085a 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html @@ -11,7 +11,7 @@ - + - {{enumUtils.toDatasetStatusString(statuses.Draft)}} {{enumUtils.toDatasetStatusString(statuses.Finalized)}} diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index f9d165abb..cfaaf9e79 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -145,8 +145,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC .subscribe(async data => { this.dmp = new DmpEditorModel().fromModel(data); this.formGroup = this.dmp.buildForm(); - this.registerFormEventsForDmpProfile(); - this.selectedDmpProfileDefinition = this.dmp.definition; + this.registerFormEventsForDmpProfile(this.dmp.definition); if (!this.editMode || this.dmp.status === Status.Inactive) { this.formGroup.disable(); } this.breadCrumbs = Observable.of([ @@ -187,7 +186,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC }); } - registerFormEventsForDmpProfile(): void { + registerFormEventsForDmpProfile( definitionPropertys?:DmpProfileDefinition): void { this.formGroup.get('profile').valueChanges .pipe(takeUntil(this._destroyed)) .subscribe(Option => { @@ -201,6 +200,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC } else { this.selectedDmpProfileDefinition = null; } + this.selectedDmpProfileDefinition=definitionPropertys; }) } diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html index 52dacb3fd..4a917b7dc 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html @@ -90,8 +90,4 @@
- - - -
\ No newline at end of file diff --git a/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.html b/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.html index 0575b8f12..690551f54 100644 --- a/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.html +++ b/dmp-frontend/src/app/ui/project/listing/criteria/project-criteria.component.html @@ -27,6 +27,9 @@ + + - + {{ 'CRITERIA.PROJECTS.TYPES.ON-GOING' | translate}} diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 56a244508..20fef7e00 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -259,7 +259,7 @@ "UPLOAD-XML-FILE-TITLE": "Select Xml file with Dataset Profile to Upload", "UPLOAD-XML-NAME": "Name Of Dataset Profile", "UPLOAD-XML-IMPORT": "File", - "UPLOAD-XML-FILE-CANCEL": "Cansel" + "UPLOAD-XML-FILE-CANCEL": "Cancel" } }, "DATASET-LISTING": { @@ -390,7 +390,7 @@ "UPLOAD-XML-FILE-TITLE": "Select Xml file with Dmp Profile to Upload", "UPLOAD-XML-NAME": "Name Of Dmp Profile", "UPLOAD-XML-IMPORT": "File", - "UPLOAD-XML-FILE-CANCEL": "Cansel" + "UPLOAD-XML-FILE-CANCEL": "Cancel" } }, "DYNAMIC-FORM": {