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 3f4f17467282b58fa58d51e8a0fc1ac73a54749a Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:45:00 2015 +0100 Plan d'échantillonnage, afficher colonne Société / Laboratoire en profil coordinateur et observateur (fixes #6559) --- .../content/sclerochronology/sampling-plan.jsp | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index ea2e8a1..57c283c 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@ -187,12 +187,7 @@ </s:if> </div> -<s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - <s:set var="nbColumnsForProfessionInFullView" value="11" /> -</s:if> -<s:else> - <s:set var="nbColumnsForProfessionInFullView" value="10" /> -</s:else> +<s:set var="nbColumnsForProfessionInFullView" value="11" /> <s:set var="nbColumnsForProfessionInCompactView" value="7" /> <s:set var="nbColumnsForMonths" value="%{samplingPlan.months.size() + 1}" /> <s:set var="nbColumnsForOther" value="2" /> @@ -230,11 +225,9 @@ <!-- Profession columns --> <th><s:text name="wao.ui.field.SampleRow.code"/></th> <th><s:text name="wao.ui.samplingPlan.program"/></th> - <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - <th class="only-in-full-view"> - <s:text name="wao.ui.entity.Organisation"/> - </th> - </s:if> + <th class="only-in-full-view"> + <s:text name="wao.ui.entity.Organisation"/> + </th> <th><s:text name="wao.ui.entity.FishingZone"/></th> <th class="only-in-full-view"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></th> <th><s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/></th> @@ -293,11 +286,9 @@ </s:if> </th> <td><s:property value="programName" /></td> - <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - <td class="only-in-full-view"> - <s:property value="organisationFullName" /> - </td> - </s:if> + <td class="only-in-full-view"> + <s:property value="organisationFullName" /> + </td> <td class="only-in-full-view"><s:property value="fishingZones" /></td> <td class="only-in-compact-view"> <s:if test="fishingZonesInfos == null"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.