diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/notification/NotificationServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/notification/NotificationServiceImpl.java index 818e5a1d0..c6a6e4e4f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/notification/NotificationServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/notification/NotificationServiceImpl.java @@ -65,7 +65,7 @@ public class NotificationServiceImpl implements NotificationService { public void persist(NotificationPersist model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException { logger.debug(new MapLogEntry("persisting notification").And("model", model).And("fields", fields)); - //this.authorizationService.authorizeForce(Permission.AuthenticatedRole); + this.authorizationService.authorizeForce(Permission.AuthenticatedRole); Boolean isUpdate = this.conventionService.isValidGuid(model.getId()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LanguageController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LanguageController.java index 7b694fb1c..e087cf1df 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LanguageController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/LanguageController.java @@ -6,6 +6,7 @@ import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.commons.validation.ValidationFilterAnnotation; import eu.eudat.data.LanguageEntity; import eu.eudat.model.Language; +import eu.eudat.model.UserContactInfo; import eu.eudat.model.builder.LanguageBuilder; import eu.eudat.model.censorship.LanguageCensor; import eu.eudat.model.persist.LanguagePersist; @@ -16,6 +17,7 @@ import eu.eudat.service.language.LanguageService; import gr.cite.tools.auditing.AuditService; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.censor.CensorFactory; +import gr.cite.tools.data.query.Ordering; import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyForbiddenException; @@ -138,6 +140,7 @@ public class LanguageController { this.censorFactory.censor(LanguageCensor.class).censor(lookup.getProject(), null); LanguageQuery query = lookup.enrich(this.queryFactory).authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermissionOrPublic); + query.setOrder(new Ordering().addAscending(Language._ordinal)); List data = query.collectAs(lookup.getProject()); List models = this.builderFactory.builder(LanguageBuilder.class).authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermissionOrPublic).build(lookup.getProject(), data);