Author: bleny Date: 2014-06-23 23:59:05 +0200 (Mon, 23 Jun 2014) New Revision: 2099 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2099 Log: hide some actions for guest Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-23 21:14:31 UTC (rev 2098) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-23 21:59:05 UTC (rev 2099) @@ -296,6 +296,10 @@ return ! userProfile.isGuest(); } + public boolean isAuthorizedToViewSampleRowLog() { + return ! userProfile.isGuest(); + } + public boolean isAuthorizedToViewSynthesis() { return ! userProfile.isGuest(); } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 21:59:05 UTC (rev 2099) @@ -453,15 +453,17 @@ </s:a> </li> </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewSampleRowLog"> + <li> + <s:url action="sample-row-log" id="sampleRowLogUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{sampleRowLogUrl}"> + <i class="icon-time"></i> <s:text name="wao.ui.action.viewSampleRowLog" /> + </s:a> + </li> + </s:if> <li> - <s:url action="sample-row-log" id="sampleRowLogUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{sampleRowLogUrl}"> - <i class="icon-time"></i> <s:text name="wao.ui.action.viewSampleRowLog" /> - </s:a> - </li> - <li> <s:url action="sampling-plan" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> @@ -477,7 +479,7 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> - <s:if test="elligibleBoatsProvided"> + <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> <s:url action="boats" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> @@ -487,16 +489,18 @@ </s:a> </li> </s:if> - <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> - <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> - <s:param name="filter.periodFrom" /> - <s:param name="filter.periodTo" /> - </s:url> - <s:a href="%{viewAssociatedContactsUrl}"> - <i class="fa fa-stack-exchange"></i> <s:text name="wao.ui.action.viewAssociatedContacts" /> - </s:a> - </li> + <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <li> + <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> + <s:param name="filter.periodFrom" /> + <s:param name="filter.periodTo" /> + </s:url> + <s:a href="%{viewAssociatedContactsUrl}"> + <i class="fa fa-stack-exchange"></i> <s:text name="wao.ui.action.viewAssociatedContacts" /> + </s:a> + </li> + </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> <s:url action="boats" id="createAssociatedContactUrl"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:59:05 UTC (rev 2099) @@ -432,15 +432,17 @@ </s:a> </li> </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewSampleRowLog"> + <li> + <s:url action="sample-row-log" id="sampleRowLogUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{sampleRowLogUrl}"> + <i class="icon-time"></i> <s:text name="wao.ui.action.viewSampleRowLog" /> + </s:a> + </li> + </s:if> <li> - <s:url action="sample-row-log" id="sampleRowLogUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{sampleRowLogUrl}"> - <i class="icon-time"></i> <s:text name="wao.ui.action.viewSampleRowLog" /> - </s:a> - </li> - <li> <s:url action="sampling-plan" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> @@ -456,7 +458,7 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> - <s:if test="elligibleBoatsProvided"> + <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> <s:url action="boats" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> @@ -466,16 +468,18 @@ </s:a> </li> </s:if> - <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> - <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> - <s:param name="filter.periodFrom" /> - <s:param name="filter.periodTo" /> - </s:url> - <s:a href="%{viewAssociatedContactsUrl}"> - <i class="fa fa-stack-exchange"></i> <s:text name="wao.ui.action.viewAssociatedContacts" /> - </s:a> - </li> + <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <li> + <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> + <s:param name="filter.periodFrom" /> + <s:param name="filter.periodTo" /> + </s:url> + <s:a href="%{viewAssociatedContactsUrl}"> + <i class="fa fa-stack-exchange"></i> <s:text name="wao.ui.action.viewAssociatedContacts" /> + </s:a> + </li> + </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> <s:url action="boats" id="createAssociatedContactUrl">