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

[<hs...@us...>]

Revision: 1009
          http://treebase.svn.sourceforge.net/treebase/?rev=1009&view=rev
Author:   hshyket
Date:     2012-01-06 21:20:13 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
Fixing X-Access-Code restriction

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2012-01-06 16:46:50 UTC (rev 1008)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java	2012-01-06 21:20:13 UTC (rev 1009)
@@ -65,6 +65,7 @@
 	private static String searchBase = "/treebase-web/search/";
 	
 	private boolean redirectDownload = true;
+	private Study TBStudy = null;
     
 	/**
 	 * Child classes return the display page for the focal type
@@ -116,8 +117,15 @@
 	            	// output format is something else, re-direct to download services
 	            	else {
 	                    url = createDownloadUrl(tbID.getId(),serializationFormat,req);
-	                    if (!redirectDownload && !ControllerUtil.isReviewerAccessGranted(req, tbID)) {
-	                    	url = "/treebase-web/accessviolation.html";
+	                    if (!redirectDownload ) {
+	                    	if (TBStudy != null) {
+	                    		if (!ControllerUtil.isReviewerAccessGranted(req, TBStudy.getTreebaseIDString())) {
+	                    			url = "/treebase-web/accessviolation.html";
+	                    		}
+	                    	}
+	                    	else {
+	                    		url = "/treebase-web/accessviolation.html";
+	                    	}
 	                    }
 	            	}
 	            }
@@ -286,8 +294,9 @@
 		}
 	}
 	
-	public void checkAccess(boolean isPublished) {
-		redirectDownload = isPublished;
+	public void setStudy(Study study) {
+		TBStudy = study;
+		redirectDownload = study.isPublished();
 	}
 
 }

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java	2012-01-06 16:46:50 UTC (rev 1008)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java	2012-01-06 21:20:13 UTC (rev 1009)
@@ -45,7 +45,7 @@
 			throw new ObjectNotFoundException("Can't find study for matrix "+objectId);
 		}
 		
-		checkAccess(matrix.getStudy().isPublished());
+		setStudy(matrix.getStudy());
 		
 		Map<String,String> params = new HashMap<String,String>();
 		params.put("id", ""+study.getId());

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java	2012-01-06 16:46:50 UTC (rev 1008)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java	2012-01-06 21:20:13 UTC (rev 1009)
@@ -40,7 +40,7 @@
 			throw new ObjectNotFoundException("Can't find study " + objectId);
 		}
 		
-		checkAccess(study.isPublished());
+		setStudy(study);
 		
 		Map<String,String> params = new HashMap<String,String>();
 		params.put("id", ""+objectId);

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java	2012-01-06 16:46:50 UTC (rev 1008)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java	2012-01-06 21:20:13 UTC (rev 1009)
@@ -44,10 +44,7 @@
 		if ( study == null ) {
 			throw new ObjectNotFoundException("Can't find study for tree "+objectId);
 		}
-		
-		//not checking access due to need for Phloywidget to access tree when in review 
-		//checkAccess(phyloTree.getStudy().isPublished());
-		
+				
 		Map<String,String> params = new HashMap<String,String>();
 		params.put("id",""+study.getId());
 		params.put("treeid", ""+objectId);

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