litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing more portal filtering NIHVIVO-194

Browse source
This commit is contained in:
bdc34 2010-04-03 00:29:42 +00:00
parent 5da58324b8
commit 6b6cef2e71
4 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
View file

@ -140,7 +140,7 @@ public class VitroRequestPrep implements Filter {
return;
}
vreq.setPortal(portal);
portalFlag = new PortalFlag((HttpServletRequest)request,_appbean, portal);
portalFlag = new PortalFlag((HttpServletRequest)request,_appbean, portal, wdf);
vreq.setPortalFlag(portalFlag);
}
}catch(FlagException ex){

6
webapp/src/edu/cornell/mannlib/vitro/webapp/flags/PortalFlag.java
View file

@ -9,6 +9,7 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils;
import edu.cornell.mannlib.vitro.webapp.flags.RequestToPortalFlag;
@ -118,10 +119,11 @@ public class PortalFlag {
* Use this to make a new PortalFlag from the http request and the ServletContext.
*
* @param req
* @param wdf TODO
*/
public PortalFlag(HttpServletRequest req,ApplicationBean appBean, Portal portalBean)
public PortalFlag(HttpServletRequest req,ApplicationBean appBean, Portal portalBean, WebappDaoFactory wdf)
throws FlagException {
RequestToPortalFlag.preparePortalStateForFiltering(this, req,appBean,portalBean);
RequestToPortalFlag.preparePortalStateForFiltering(this, req,appBean,portalBean,wdf);
}
/******************* methods *************************/

28
webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToPortalFlag.java
View file

@ -2,21 +2,20 @@
package edu.cornell.mannlib.vitro.webapp.flags;
import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vitro.webapp.flags.PortalFlag;
import edu.cornell.mannlib.vitro.webapp.flags.FlagException;
import edu.cornell.mannlib.vitro.webapp.flags.AuthFlag;
import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.List;
import java.util.Arrays;
import java.util.Set;
import java.util.HashSet;
import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils;
/**
* Created by IntelliJ IDEA.
@ -145,7 +144,7 @@ public class RequestToPortalFlag {
*/
public static void preparePortalStateForFiltering(PortalFlag portalFlag, HttpServletRequest req,
ApplicationBean appBean, Portal portalBean) throws FlagException {
ApplicationBean appBean, Portal portalBean, WebappDaoFactory wdf) throws FlagException {
VitroRequest request = new VitroRequest(req);
@ -163,7 +162,8 @@ public class RequestToPortalFlag {
portalFlag.flag3Active=appBean.isFlag3Active() ;
if( !portalBean.isFlag1Filtering()
|| "nofiltering".equals(req.getParameter("flag1")) ) {
|| "nofiltering".equals(req.getParameter("flag1"))
|| wdf.getApplicationDao().isFlag1Active() ) {
portalFlag.flag1Active=false;
portalFlag.flag2Active=false;
portalFlag.flag3Active=false;