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

Fixes bug on DMP update not being ableto remove Funder.

This commit is contained in:
gkolokythas 2019-08-27 18:02:44 +03:00
parent bca715d52b
commit d5970126d2
2 changed files with 4 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/logic/managers/DataManagementPlanManager.java
View File

@ -457,7 +457,7 @@ public class DataManagementPlanManager {
if (newDmp.getGrant().getId() != null) { if (newDmp.getGrant().getId() != null) {
Grant grant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(newDmp.getGrant().getId()); Grant grant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(newDmp.getGrant().getId());
if (grant.getFunder() != null if (grant.getFunder() != null && newDmp.getGrant().getFunder() != null
&& !grant.getFunder().getId().equals(newDmp.getGrant().getFunder().getId()) && !grant.getFunder().getId().equals(newDmp.getGrant().getFunder().getId())
&& !grant.getCreationUser().getId().equals(user.getId())){ && !grant.getCreationUser().getId().equals(user.getId())){
throw new Exception("User is not the owner of the Grant, therefore, cannot edit it"); throw new Exception("User is not the owner of the Grant, therefore, cannot edit it");

3
dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
View File

@ -309,6 +309,9 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
dataManagementPlanEntity.getGrant().setFunder(funder); dataManagementPlanEntity.getGrant().setFunder(funder);
} }
} }
else {
dataManagementPlanEntity.getGrant().setFunder(null);
}
if (this.project != null) { if (this.project != null) {
if (this.project.getExistProject() != null && this.project.getLabel() == null && this.project.getDescription() == null) if (this.project.getExistProject() != null && this.project.getLabel() == null && this.project.getDescription() == null)