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

Merge to trunk. Removing more portal filtering when there is only one portal. NIHVIVO-998

Browse source
This commit is contained in:
bdc34 2010-07-24 21:57:54 +00:00
parent 89f3bbfbd8
commit 60c71ee2ae
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils; import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils;
/** /**
* Created by IntelliJ IDEA. * This controls how portal filtering is set for request. It should be refactored or deleted.
*
* User: bdc34 * User: bdc34
* Date: Apr 5, 2007 * Date: Apr 5, 2007
* Time: 10:50:55 AM * Time: 10:50:55 AM
@ -200,7 +201,9 @@ public class RequestToPortalFlag {
portalFlag.setFlag1Exclusive(false); portalFlag.setFlag1Exclusive(false);
} }
portalFlag.setFlag1DisplayStatus( PortalFlag.SHOW_NO_PORTALS ); portalFlag.setFlag1DisplayStatus( PortalFlag.SHOW_NO_PORTALS );
if (appBean.getMaxPortalId()>1) { if( wdf.getApplicationDao().isFlag1Active() == false)
portalFlag.setFlag1DisplayStatus( PortalFlag.SHOW_ALL_PORTALS);
else if (appBean.getMaxPortalId()>1) {
portalFlag.setFlag1DisplayStatus(PortalFlag.SHOW_CURRENT_PORTAL); portalFlag.setFlag1DisplayStatus(PortalFlag.SHOW_CURRENT_PORTAL);
String[] flag1ParameterValues=request.getParameterValues("flag1"); String[] flag1ParameterValues=request.getParameterValues("flag1");
if (flag1ParameterValues==null) { if (flag1ParameterValues==null) {