[Treebase-guts] SF.net SVN: treebase:[461] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/BaseFormController.java

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

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

Log Message:
-----------
Added shortcut for when the reviewer hits cancel: no access is granted, the agreement is again displayed if the reviewer re-visits the same special URL

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java

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 17:07:52 UTC (rev 460)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-15 17:09:07 UTC (rev 461)
@@ -179,6 +179,11 @@
 	}
 
 	private boolean isReviewerAccessGranted(HttpServletRequest pRequest) {
+		if ( "cancel".equals(pRequest.getParameter("agreement")) ) {
+			pRequest.getSession().setAttribute(Constants.REVIEWER_ACCESS_GRANTED, false);
+			pRequest.getSession().setAttribute("displayAgreement",true);
+			return false;
+		}
 		boolean reviewerAccessGranted = false;
 		Object xAccesCodeObject = pRequest.getSession().getAttribute(Constants.X_ACCESS_CODE);
 		if ( xAccesCodeObject != null ) {
@@ -204,7 +209,6 @@
 					pRequest.getSession().setAttribute("displayAgreement",false);
 				}
 				pRequest.getSession().setAttribute(Constants.REVIEWER_ACCESS_GRANTED, reviewerAccessGranted);
-
 			}
 			else {
 				LOGGER.info("x-access-code doesn't match computed hashed study id");


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