Author: bleny Date: 2011-06-23 12:18:32 +0000 (Thu, 23 Jun 2011) New Revision: 1352 Log: hide page Boats and column Action from SamplingPlan for role professional Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-06-23 12:15:45 UTC (rev 1351) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-06-23 12:18:32 UTC (rev 1352) @@ -83,7 +83,7 @@ * * @author fdesbois <fdesbois at codelutin.com> */ - at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER, UserRole.PROFESSIONAL}) + at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) @Import(stylesheet = "context:css/boats.css") public class Boats { Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-06-23 12:15:45 UTC (rev 1351) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-06-23 12:18:32 UTC (rev 1352) @@ -506,7 +506,11 @@ } public int getNbColumnsForOther() { - int nbColumnsForOther = 2; // comment, actions + int nbColumnsForOther = 1; // comment + // actions + if (showActions()) { + nbColumnsForOther += 1; + } if (user.isObsMer()) { nbColumnsForOther += 2; // nbObservants, averageTideTime } @@ -571,6 +575,10 @@ /** ------------------------- ACTIONS ---------------------------------- **/ + public boolean showActions() { + return ! user.isProfessional(); + } + /** * Can edit the sampleRow. Only for admin with no readOnly rights. * Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-06-23 12:15:45 UTC (rev 1351) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-06-23 12:18:32 UTC (rev 1352) @@ -143,7 +143,9 @@ <td class="width60">${message:wao.ui.samplingPlan.nbObservants}</td> </t:if> <td class="width60 bright">${message:wao.ui.misc.comment}</td> - <td class="bright">${message:wao.ui.samplingPlan.actions}</td> + <t:if test="showActions()"> + <td class="bright">${message:wao.ui.samplingPlan.actions}</td> + </t:if> </tr> </thead> <tbody> @@ -279,37 +281,39 @@ </t:if> </td> <!-- Actions --> - <td class="${actionsClass} bright" style="white-space: nowrap;"> - <t:unless t:test="user.guest"> - <t:if t:test="rowNotFinished"> - <a t:type="pagelink" t:page="boats" t:context="contextForBoats"> - <img src="${asset:context:}/img/boat.png" alt="${message:wao.ui.entity.Boats}" /> + <t:if test="showActions()"> + <td class="${actionsClass} bright" style="white-space: nowrap;"> + <t:unless t:test="user.guest"> + <t:if t:test="rowNotFinished"> + <a t:type="pagelink" t:page="boats" t:context="contextForBoats"> + <img src="${asset:context:}/img/boat.png" alt="${message:wao.ui.entity.Boats}" /> + </a> + <p:else> + <img src="${asset:context:}/img/boat-unavailable-22px.png" alt="Navire impossible" /> + </p:else> + </t:if> + <t:unless test="user.professional"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/clock-22px.png" alt="Historique" title="Voir historique de la ligne"/> + </a> + </t:unless> + </t:unless> + <t:if t:test="canEditSampleRow()"> + <a t:type="pagelink" t:page="sampleRowForm" t:context="contextForEditingSampleRow" title="${message:wao.ui.action.edit}"> + <img src="${asset:context:}/img/edit.png" alt="${message:wao.ui.action.edit}" /> </a> - <p:else> - <img src="${asset:context:}/img/boat-unavailable-22px.png" alt="Navire impossible" /> - </p:else> + <t:unless t:test="row.hasSampleMonthRealTideTime()"> + <a t:type="actionlink" t:id="deleteSampleRow" t:context="rowIndex" title="${message:wao.ui.action.deleteSampleRow}" + t:mixins="nuiton/confirm" t:message="${format:wao.ui.action.deleteSampleRow.confirm=row.code}"> + <img src="${asset:context:}/img/delete2.png" alt="${message:wao.ui.action.deleteSampleRow}" /> + </a> + <p:else> + <img src="${asset:context:}/img/delete-unavailable-22px.png" alt="${message:wao.ui.unavailableOperation}" /> + </p:else> + </t:unless> </t:if> - <t:unless test="user.professional"> - <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> - <img src="${asset:context:}/img/clock-22px.png" alt="Historique" title="Voir historique de la ligne"/> - </a> - </t:unless> - </t:unless> - <t:if t:test="canEditSampleRow()"> - <a t:type="pagelink" t:page="sampleRowForm" t:context="contextForEditingSampleRow" title="${message:wao.ui.action.edit}"> - <img src="${asset:context:}/img/edit.png" alt="${message:wao.ui.action.edit}" /> - </a> - <t:unless t:test="row.hasSampleMonthRealTideTime()"> - <a t:type="actionlink" t:id="deleteSampleRow" t:context="rowIndex" title="${message:wao.ui.action.deleteSampleRow}" - t:mixins="nuiton/confirm" t:message="${format:wao.ui.action.deleteSampleRow.confirm=row.code}"> - <img src="${asset:context:}/img/delete2.png" alt="${message:wao.ui.action.deleteSampleRow}" /> - </a> - <p:else> - <img src="${asset:context:}/img/delete-unavailable-22px.png" alt="${message:wao.ui.unavailableOperation}" /> - </p:else> - </t:unless> - </t:if> - </td> + </td> + </t:if> </tr> </t:loop> </tbody>