Author: bleny Date: 2010-11-02 19:38:31 +0000 (Tue, 02 Nov 2010) New Revision: 725 Log: bugfix : form to get data-reliability appear now 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 2010-11-02 17:00:31 UTC (rev 724) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-02 19:38:31 UTC (rev 725) @@ -421,6 +421,12 @@ /**************************** CONTACT ROW ACTION **************************/ + public boolean isDataReliabilityAsked() { + boolean result = contact.getValidationProgram() == null; + return result; + } + + /** * Flag to know if it's only edition (=true) or save action (=false) */ Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-02 17:00:31 UTC (rev 724) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-02 19:38:31 UTC (rev 725) @@ -292,11 +292,10 @@ <p:dataReliabilityCell> <t:if t:test="boardingDone"> <t:if t:test="contact.validationCompany"> - <t:if t:test="contact.validationProgram"> - ${contact.dataReliability.label} + <t:if test="dataReliabilityAsked"> + <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> <p:else> - <!-- FIXME bleny 20101102 never occur --> - <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> + ${contact.dataReliability.label} </p:else> </t:if> </t:if>