[Treebase-guts] SF.net SVN: treebase:[452] trunk/treebase-web/src/main

[<rv...@us...>]

Revision: 452
          http://treebase.svn.sourceforge.net/treebase/?rev=452&view=rev
Author:   rvos
Date:     2010-01-15 15:17:49 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
Added flag and logic for displaying reviewer notice/agreement on initial access check.

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java	2010-01-15 15:05:00 UTC (rev 451)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/Constants.java	2010-01-15 15:17:49 UTC (rev 452)
@@ -25,6 +25,8 @@
 	 * objects to be stores in the session
 	 */
 	public static final String X_ACCESS_CODE = "x-access-code";
+	public static final String REVIEWER_ACCESS_GRANTED = "reviewerAccessGranted";
+	
 	public static final String STUDY_MAP = "studyMap";
 	public static final String ANALYSIS_MAP = "analysisMap";
 	public static final String ANALYSIS_STEP_MAP = "analysisStepMap";

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-15 15:05:00 UTC (rev 451)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-15 15:17:49 UTC (rev 452)
@@ -197,6 +197,11 @@
 				//saveMessage(pRequest,"You are in reviewer access mode.");				
 				LOGGER.info("x-access-code matches computed hashed study id");
 				LOGGER.info("Reviewer access is granted");
+				if ( ! (Boolean)pRequest.getSession().getAttribute(Constants.REVIEWER_ACCESS_GRANTED) ) {
+					pRequest.getSession().setAttribute("displayAgreement",true);
+				}
+				pRequest.getSession().setAttribute(Constants.REVIEWER_ACCESS_GRANTED, reviewerAccessGranted);
+
 			}
 			else {
 				LOGGER.info("x-access-code doesn't match computed hashed study id");
@@ -206,7 +211,6 @@
 		else {
 			LOGGER.info("No x-access-code parameter supplied");
 		}
-		pRequest.setAttribute("reviewerAccessGranted", reviewerAccessGranted);
 		return reviewerAccessGranted;
 	}
 

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp	2010-01-15 15:05:00 UTC (rev 451)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp	2010-01-15 15:17:49 UTC (rev 452)
@@ -183,7 +183,7 @@
 <c:if test="${reviewerAccessGranted}">
   	<div>
   		<img src="<fmt:message key="icons.info"/>" alt="<fmt:message key="icon.information"/>" class="icon" />
-		<span style="color: red; ">You are in reviewer mode ${initialReviewerRedirect}.</span>
+		<span style="color: red; ">You are in reviewer mode ${displayAgreement}.</span>
 	</div>
 </c:if>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.