Author: bleny Date: 2014-06-19 15:36:10 +0200 (Thu, 19 Jun 2014) New Revision: 2069 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2069 Log: fixes #5279 always show edit contact link Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-19 13:28:17 UTC (rev 2068) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-19 13:36:10 UTC (rev 2069) @@ -273,12 +273,6 @@ return result; } - public boolean isAuthorizedToEditContactObservers(Contact contact) { - return isCoordinatorOrObserver() && - contact.getValidationProgram() == null - && isCanWrite(); - } - public boolean isAuthorizedToEditObservationReport(Contact contact) { return isCoordinatorOrObserver() && contact.getValidationCompany() == null Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-19 13:28:17 UTC (rev 2068) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-19 13:36:10 UTC (rev 2069) @@ -496,23 +496,20 @@ <b class="caret"></b> </a> <ul class="dropdown-menu"> - <s:if test="authenticatedWaoUser.isAuthorizedToEditOrDeleteContact(#contact)"> - <li> - <s:if test="authenticatedWaoUser.admin"> - <s:set name="focusAnchor">adminFocus</s:set> - </s:if> - <s:else> - <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> - </s:else> - <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> - <s:param name="contactId" value="topiaId"/> - - </s:url> - <s:a href="%{editContactUrl}"> - <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteContact"/> - </s:a> - </li> - </s:if> + <li> + <s:if test="authenticatedWaoUser.admin"> + <s:set name="focusAnchor">adminFocus</s:set> + </s:if> + <s:else> + <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> + </s:else> + <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> + <s:param name="contactId" value="topiaId"/> + </s:url> + <s:a href="%{editContactUrl}"> + <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteContact"/> + </s:a> + </li> <s:if test="authenticatedWaoUser.authorizedToChangeContactValidation"> <li> <s:url action="validate-contact-json" id="acceptContactUrl" escapeAmp="false"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-19 13:28:17 UTC (rev 2068) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-19 13:36:10 UTC (rev 2069) @@ -184,6 +184,9 @@ <s:form> + <s:set name="editObservationReport" + value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> + <s:hidden name="contactId" value="%{contactId}"/> <fieldset> @@ -197,7 +200,7 @@ label="%{getText('wao.ui.field.Contact.mainObserver')}" list="observers" emptyOption="true" - disabled="%{!#editObservers}" + disabled="%{!#editObservationReport}" cssClass="input-large" /> @@ -206,7 +209,7 @@ label="%{getText('wao.ui.field.Contact.secondaryObservers')}" list="observers" multiple="true" - disabled="%{!#editObservers}" + disabled="%{!#editObservationReport}" cssClass="input-xlarge" /> @@ -216,9 +219,6 @@ <fieldset id="coordinatorOrObserverFocus"> <legend><s:text name="wao.ui.misc.observationReport"/></legend> - <s:set name="editObservationReport" - value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> - <s:textfield name="updateContactCommand.contact.observationBeginDate" label="%{getText('wao.ui.field.Contact.beginDate')}" placeholder="%{getDateTimePlaceholder()}"