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

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

Revision: 426
          http://treebase.svn.sourceforge.net/treebase/?rev=426&view=rev
Author:   rvos
Date:     2010-01-13 17:29:26 +0000 (Wed, 13 Jan 2010)

Log Message:
-----------
Implemented getConditionalModelAndView, which checks whether the supplied ModelAndView should be returned (which is the case if an x-access-granted parameter was supplied or access was explicitly granted), or an authorization violation view. 

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-13 17:25:37 UTC (rev 425)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/BaseFormController.java	2010-01-13 17:29:26 UTC (rev 426)
@@ -141,6 +141,22 @@
 	protected void setAuthorizationChecked(boolean pAuthorizationChecked) {
 		mAuthorizationChecked = pAuthorizationChecked;
 	}
+	
+	/**
+	 * 
+	 * @param pRequest
+	 * @param pModelAndView
+	 * @return
+	 */
+	protected ModelAndView getConditionalModelAndView(
+		HttpServletRequest pRequest,
+		ModelAndView pModelAndView) {
+		if ( isReviewerAccessGranted(pRequest) || isAuthorizationChecked() ) {
+			return pModelAndView;
+		} else {
+			return new ModelAndView(AUTHORIZATION_VIOLATION_VIEW);
+		}		
+	}
 
 	@Override
 	protected ModelAndView showForm(


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