diff --git a/geoportal-common/CHANGELOG.md b/geoportal-common/CHANGELOG.md index c3663b3..3c7bdcd 100644 --- a/geoportal-common/CHANGELOG.md +++ b/geoportal-common/CHANGELOG.md @@ -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 - Fixes [#22369](https://support.d4science.org/issues/22369) +- Fixes [#22338](https://support.d4science.org/issues/22338) # [v1.0.7] - 2021-09-20 - Refactored repositories diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java index 820bd69..45c97b7 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/model/legacy/Concessione.java @@ -218,7 +218,7 @@ public class Concessione extends Record{ validator.setObjectName("Concessione"); - setPolicy(AccessPolicy.OPEN); + // setPolicy(AccessPolicy.OPEN); @@ -258,18 +258,6 @@ public class Concessione extends Record{ 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")) { ValidationReport posReport=posizionamentoScavo.validateForInsertion(); @@ -282,15 +270,11 @@ public class Concessione extends Record{ for(OtherContent content:genericContent) validator.addChild(content.validateForInsertion()); - if(validator.checkMandatory(pianteFineScavo,"Piante fine scavo")) + if(pianteFineScavo!=null) for(LayerConcessione l:pianteFineScavo) { validator.addChild(l.validateForInsertion()); } - - - - - + return validator; }