MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign

This commit is contained in:
apapachristou 2020-07-08 18:28:47 +03:00
parent ff532c56fb 7a09d85353
commit f451314473
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java
View File

@ -101,6 +101,8 @@ public class DmpQuickWizardModel {
dataManagementPlanEntity.setAssociatedUsers(user);
dataManagementPlanEntity.setExtraProperties(new HashMap<>());
dataManagementPlanEntity.getExtraProperties().put("language", this.language);
dataManagementPlanEntity.getExtraProperties().put("visible", false);
dataManagementPlanEntity.getExtraProperties().put("contact", principal.getId().toString());
return dataManagementPlanEntity;
}

2
dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
View File

@ -228,6 +228,8 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
this.dmp.project = new ProjectFormModel();
this.dmp.funder = new FunderFormModel();
this.dmp.extraProperties = new ExtraPropertiesFormModel();
this.dmp.extraProperties.visible = false;
this.dmp.extraProperties.contact = this.authService.current().id;
this.formGroup = this.dmp.buildForm();
this.registerFormEventsForNewItem();
if (this.isAuthenticated) {

6
dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
View File

@ -23,8 +23,8 @@ import { DmpUploadDialogue } from './upload-dialogue/dmp-upload-dialogue.compone
import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service';
import { isNullOrUndefined } from 'util';
import { AuthService } from '@app/core/services/auth/auth.service';
import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.component';
import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
import { DmpCriteriaDialogComponent } from './criteria/dmp-criteria-dialog.component';
@Component({
@ -250,6 +250,10 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
getDefaultCriteria(): DmpCriteria {
const defaultCriteria = new DmpCriteria();
if (this.isPublic) {
defaultCriteria.isPublic = true;
defaultCriteria.onlyPublic = true;
}
return defaultCriteria;
}