This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 79875200af6fd3cae746405040aa43ff995fcaef Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 21 15:54:32 2015 +0100 mend --- .../main/webapp/WEB-INF/content/boat-details.jsp | 38 ++++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp b/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp index 622afb5..8e2c53e 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp @@ -205,24 +205,26 @@ <div class="control-group"> <div class="controls"> <s:iterator value="boatDetails.elligibleForSampleRows" status="status"> - <div class="elligible-sample-row"> - <s:set name="radioId">radio-<s:property value="#status.index"/></s:set> - <input type="radio" name="sampleRowId" id="<s:property value="#radioId"/>" value="<s:property value="topiaId"/>"/> - <%-- - <label for="<s:property value="%{#radioId}"/>" class="radio"> + <s:if test="authenticatedWaoUser.authorizedToCreateContact(organisation.topiaId)"> + <div class="elligible-sample-row"> + <s:set name="radioId">radio-<s:property value="#status.index"/></s:set> + <input type="radio" name="sampleRowId" id="<s:property value="#radioId"/>" value="<s:property value="topiaId"/>"/> + <%-- + <label for="<s:property value="%{#radioId}"/>" class="radio"> + <s:property value="code"/> + </label> + --%> <s:property value="code"/> - </label> - --%> - <s:property value="code"/> - <s:url action="update-boat-elligibility-json" id="updateBoatElligibilityUrl"> - <s:param name="boatId" value="boatDetails.boatInfos.boat.topiaId"/> - <s:param name="sampleRowId" value="topiaId"/> - <s:param name="active" value="false"/> - </s:url> - <s:a href="%{updateBoatElligibilityUrl}" cssClass="btn btn-link remove-boat-eligibility"> - <i class="icon-remove"></i> - </s:a> - </div> + <s:url action="update-boat-elligibility-json" id="updateBoatElligibilityUrl"> + <s:param name="boatId" value="boatDetails.boatInfos.boat.topiaId"/> + <s:param name="sampleRowId" value="topiaId"/> + <s:param name="active" value="false"/> + </s:url> + <s:a href="%{updateBoatElligibilityUrl}" cssClass="btn btn-link remove-boat-eligibility"> + <i class="icon-remove"></i> + </s:a> + </div> + </s:if> </s:iterator> </div> </div> @@ -260,7 +262,7 @@ </s:if> <s:else> <s:if test="boatDetails.newContactCreatable"> - <s:if test="boatDetails.newContactCreatable && authenticatedWaoUser.authorizedToCreateContact"> + <s:if test="boatDetails.newContactCreatable && authenticatedWaoUser.authorizedToCreateContact(startBoatSelectionForSampleRow.organisation.topiaId)"> <s:url action="create-contact" id="createContactUrl"> <s:param name="boatId" value="boatDetails.boatInfos.boat.topiaId"/> <s:param name="sampleRowId" value="startBoatSelectionForSampleRow.topiaId"/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.