Author: bleny Date: 2011-01-11 15:38:11 +0000 (Tue, 11 Jan 2011) New Revision: 911 Log: fix operation (non-)availability in Contacts Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-01-11 10:35:14 UTC (rev 910) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-01-11 15:38:11 UTC (rev 911) @@ -453,6 +453,24 @@ return (user.isAdmin() || user.isCoordinator()) && ! user.isReadOnly(); } + public boolean canEditSampleRow() { + boolean canEdit = user.getProfile().isCanWrite() && + + // user is admin and no validation program + (user.isAdminAndCanWrite() && contact.getValidationProgram() == null + + || // or + // user is coordinator or observer + user.isCoordinatorOrObserver() && contact.getValidationCompany() == null); + return canEdit; + } + + public boolean canDeleteSampleRow() { + boolean noValidation = contact.getValidationProgram() == null + && contact.getValidationCompany() == null; + return noValidation && user.getProfile().isCanWrite(); + } + public boolean canValidate() { // Can't validate during edition of the contact row switch (user.getRole()) { Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-11 10:35:14 UTC (rev 910) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-11 15:38:11 UTC (rev 911) @@ -286,15 +286,15 @@ </t:if> </p:commentAdminCell> <p:actionsCell> - <t:unless t:test="contact.validationProgram"> + <t:if t:test="canEditSampleRow()"> <a t:type="pagelink" t:page="contactForm" t:anchor="focus" t:context="contact.topiaId"> <img src="${asset:context:}/img/edit.png" alt="${message:wao.ui.action.edit}" title="${message:wao.ui.action.edit}" /> </a> <p:else> <img src="${asset:context:img/edit-unavailable-22px.png}" alt="${message:wao.ui.unavailableOperation}" /> </p:else> - </t:unless> - <t:if t:test="hasActions()"> + </t:if> + <t:if t:test="canDeleteSampleRow()"> <a t:type="actionlink" t:id="deleteContact" t:context="contact.topiaId" t:mixins="nuiton/confirm" t:message="${message:wao.ui.action.deleteContact.confirm}"> <img src="${asset:context:img/delete2.png}" alt="${message:wao.ui.action.deleteContact}" /> </a>