Author: bleny Date: 2014-06-23 22:11:03 +0200 (Mon, 23 Jun 2014) New Revision: 2092 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2092 Log: fixes #5314 remove data reliability for obsvente Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-06-23 20:00:40 UTC (rev 2091) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-06-23 20:11:03 UTC (rev 2092) @@ -697,27 +697,28 @@ } } + if (contact.getValidationProgram() != null && contact.getValidationCompany() == null) { + + throw new IllegalAcceptationException(contact); + } + DataReliability dataReliability = contact.getDataReliability(); if (dataReliability != null && dataReliability.isCommentRequired() && StringUtils.isBlank(contact.getCommentAdmin())) { throw new MissingContactCommentAdminException(contact); } - if (contact.getValidationProgram() != null && contact.getValidationCompany() == null) { - - throw new IllegalAcceptationException(contact); - } - if (BooleanUtils.isTrue(contact.getValidationProgram())) { //--- // validationProgram //--- + if (contact.getObsProgram().isObsMer()) { - // it's an admin validation, data-reliability field must be filled - - if (dataReliability == null || DataReliability.UNKNOWN == dataReliability) { - throw new MissingContactDataReliabilityException(contact); + // it's an admin validation, data-reliability field must be filled + if (dataReliability == null || DataReliability.UNKNOWN == dataReliability) { + throw new MissingContactDataReliabilityException(contact); + } } } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-23 20:00:40 UTC (rev 2091) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-23 20:11:03 UTC (rev 2092) @@ -116,6 +116,11 @@ filterLabel: "<s:text name="wao.ui.field.Contact.observedDataControl"/>", filterValuesField: 'observedDataControls' }, + { + filterName: 'dataReliabilities', + filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>", + filterValuesField: 'dataReliabilities' + } </s:if> <s:if test="obsVente"> { @@ -137,13 +142,8 @@ filterName: 'completeSamplings', filterLabel: "<s:text name="wao.ui.field.Contact.completeSampling"/>", filterValuesField: 'completeSamplings' - }, + } </s:if> - { - filterName: 'dataReliabilities', - filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>", - filterValuesField: 'dataReliabilities' - } ]; filter = <s:property value="filter" escapeHtml="false"/>; Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:00:40 UTC (rev 2091) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:11:03 UTC (rev 2092) @@ -325,12 +325,14 @@ <fieldset id="adminFocus"> <legend><s:text name="wao.ui.form.programEvaluation"/></legend> - <s:if test="authenticatedWaoUser.authorizedToDisplayContactDataReliability"> - <s:select name="updateContactCommand.contact.dataReliability" - label="%{getText('wao.ui.field.Contact.dataReliability')}" - list="dataReliabilities" - emptyOption="true" - disabled="%{!authenticatedWaoUser.isAuthorizedToEditContactDataReliability(updateContactCommand.contact)}"/> + <s:if test="updateContactCommand.contact.obsProgram.obsMer"> + <s:if test="authenticatedWaoUser.authorizedToDisplayContactDataReliability"> + <s:select name="updateContactCommand.contact.dataReliability" + label="%{getText('wao.ui.field.Contact.dataReliability')}" + list="dataReliabilities" + emptyOption="true" + disabled="%{!authenticatedWaoUser.isAuthorizedToEditContactDataReliability(updateContactCommand.contact)}"/> + </s:if> </s:if> <s:textarea name="updateContactCommand.contact.commentAdmin"