gCubeSystem
/
gcube-cms-suite
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#22461 #1

Merged
fabio.sinibaldi merged 27 commits from #22461 into master 2022-01-14 12:43:19 +01:00
Conversation 0 Commits 27 Files Changed 131 +4 -19
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4615786c1f - Show all commits

1
geoportal-common/CHANGELOG.md
View File

@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# [v1.0.8-SNAPSHOT] - 2021-11-10 # [v1.0.8-SNAPSHOT] - 2021-11-10
- Fixes [#22369](https://support.d4science.org/issues/22369) - Fixes [#22369](https://support.d4science.org/issues/22369)
- Fixes [#22338](https://support.d4science.org/issues/22338)
# [v1.0.7] - 2021-09-20 # [v1.0.7] - 2021-09-20
- Refactored repositories - Refactored repositories

20
geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java
View File

@ -218,7 +218,7 @@ public class Concessione extends Record{
validator.setObjectName("Concessione"); validator.setObjectName("Concessione");
setPolicy(AccessPolicy.OPEN); // setPolicy(AccessPolicy.OPEN);
@ -258,18 +258,6 @@ public class Concessione extends Record{
validator.addChild(abstractRelazione.validateForInsertion()); validator.addChild(abstractRelazione.validateForInsertion());
} }
// if(immaginiRappresentative!=null)
//
// for(UploadedImage img : immaginiRappresentative) {
// validator.setDefault(img.getSoggetto(),getSoggetto());
// validator.setDefault(img.getCreationTime(),getCreationTime());
// validator.setDefault(img.getPolicy(), getPolicy());
// validator.setDefault(img.getLicenzaID(), getLicenzaID());
//
// validator.addChild(img.validateForInsertion());
// }
//
if(validator.checkMandatory(posizionamentoScavo, "Posizionamento scavo")) { if(validator.checkMandatory(posizionamentoScavo, "Posizionamento scavo")) {
ValidationReport posReport=posizionamentoScavo.validateForInsertion(); ValidationReport posReport=posizionamentoScavo.validateForInsertion();
@ -282,15 +270,11 @@ public class Concessione extends Record{
for(OtherContent content:genericContent) for(OtherContent content:genericContent)
validator.addChild(content.validateForInsertion()); validator.addChild(content.validateForInsertion());
if(validator.checkMandatory(pianteFineScavo,"Piante fine scavo")) if(pianteFineScavo!=null)
for(LayerConcessione l:pianteFineScavo) { for(LayerConcessione l:pianteFineScavo) {
validator.addChild(l.validateForInsertion()); validator.addChild(l.validateForInsertion());
} }
return validator; return validator;
} }