This is an automated email from the git hooks/post-receive script. New commit to branch feature/6016-add-question in repository coselmar. See http://git.codelutin.com/coselmar.git commit 0f5aa2792adf5f66515d7077a05ddf742ac27f95 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Dec 1 15:41:48 2014 +0100 add question in entities model --- .../coselmar/persistence/entity/DocumentTopiaDao.java | 4 ++-- .../src/main/xmi/coselmar-model.zargo | Bin 6557 -> 9618 bytes .../coselmar/services/v1/DocumentsWebService.java | 8 ++++---- pom.xml | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java index 77321b7..cfc4a60 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java @@ -50,11 +50,11 @@ public class DocumentTopiaDao extends AbstractDocumentTopiaDao<Document> { Map<String, Object> args = new HashMap<>(); // can list all public document - String privacyPublicCondition = DaoUtils.getQueryForAttributeEquals("D", Document.PROPERTY_PRIVACY, args, DocumentPrivacy.PUBLIC, ""); + String privacyPublicCondition = DaoUtils.getQueryForAttributeEquals("D", Document.PROPERTY_PRIVACY, args, Privacy.PUBLIC, ""); hqlBuilder.append(" WHERE ( " + privacyPublicCondition); // Can list his own private document - String privacyPrivateCondition = DaoUtils.getQueryForAttributeEquals("D", Document.PROPERTY_PRIVACY, args, DocumentPrivacy.PRIVATE, ""); + String privacyPrivateCondition = DaoUtils.getQueryForAttributeEquals("D", Document.PROPERTY_PRIVACY, args, Privacy.PRIVATE, ""); String ownerCondition = DaoUtils.andAttributeEquals("D", Document.PROPERTY_OWNER, args, currentUser); hqlBuilder.append(" OR ( " + privacyPrivateCondition + " " + ownerCondition + " ) )"); diff --git a/coselmar-persistence/src/main/xmi/coselmar-model.zargo b/coselmar-persistence/src/main/xmi/coselmar-model.zargo index 04c2341..009697d 100644 Binary files a/coselmar-persistence/src/main/xmi/coselmar-model.zargo and b/coselmar-persistence/src/main/xmi/coselmar-model.zargo differ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java index 99717c1..dbb5182 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java @@ -41,7 +41,7 @@ import fr.ifremer.coselmar.converter.BeanEntityConverter; import fr.ifremer.coselmar.persistence.entity.CoselmarUser; import fr.ifremer.coselmar.persistence.entity.CoselmarUserRole; import fr.ifremer.coselmar.persistence.entity.Document; -import fr.ifremer.coselmar.persistence.entity.DocumentPrivacy; +import fr.ifremer.coselmar.persistence.entity.Privacy; import fr.ifremer.coselmar.services.CoselmarTechnicalException; import fr.ifremer.coselmar.services.CoselmarWebServiceSupport; import fr.ifremer.coselmar.services.errors.InvalidCredentialException; @@ -186,7 +186,7 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { documentEntity.setOwner(owner); documentEntity.setName(documentName); - documentEntity.setPrivacy(DocumentPrivacy.valueOf(document.getPrivacy().toUpperCase())); + documentEntity.setPrivacy(Privacy.valueOf(document.getPrivacy().toUpperCase())); documentEntity.addAllKeywords(document.getKeywords()); Date depositDate = document.getDepositDate(); @@ -370,11 +370,11 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { String viewerRole = userWebToken.getRole().toUpperCase(); // For public : only admin/supervisor/expert can access - if (document.getPrivacy() == DocumentPrivacy.PUBLIC) { + if (document.getPrivacy() == Privacy.PUBLIC) { isAuthorized = DOCUMENT_VIEW_ALLOWED_USER_ROLES.contains(viewerRole); // For Private : only admin/supervisor/owner can access - } else if (document.getPrivacy() == DocumentPrivacy.PRIVATE) { + } else if (document.getPrivacy() == Privacy.PRIVATE) { CoselmarUser documentOwner = document.getOwner(); boolean isOwner = StringUtils.equals(documentOwner.getTopiaId(), getFullUserIdFromShort(userWebToken.getUserId())); isAuthorized = isOwner || Lists.newArrayList(CoselmarUserRole.ADMIN.name(), CoselmarUserRole.SUPERVISOR.name()).contains(viewerRole); diff --git a/pom.xml b/pom.xml index 7c7bdca..9b21f6c 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,6 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> - <scope>runtime</scope> <exclusions> <exclusion> <groupId>org.hibernate.javax.persistence</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.