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

NIHVIVO-2749 Move the calculation of the MenuManagement URL into the controller.

Browse source
This commit is contained in:
j2blake 2011-07-05 21:07:46 +00:00
parent 6a284ff010
commit 57ca8f9915
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
View file

@ -19,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndividuals;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditOntology; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditOntology;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditSiteInformation; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditSiteInformation;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageMenus;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeSiteAdminPage; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeSiteAdminPage;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages;
@ -126,10 +127,17 @@ public class SiteAdminController extends FreemarkerHttpServlet {
urls.put("siteInfo", urlBuilder.getPortalUrl("/editForm", new ParamMap("controller", "ApplicationBean"))); urls.put("siteInfo", urlBuilder.getPortalUrl("/editForm", new ParamMap("controller", "ApplicationBean")));
} }
// TODO this goes away when Menu Management is complete - jblake
if (PolicyHelper.isAuthorizedForActions(vreq, MenuN3EditController.REQUIRED_ACTIONS)) { if (PolicyHelper.isAuthorizedForActions(vreq, MenuN3EditController.REQUIRED_ACTIONS)) {
urls.put("menuN3Editor", urlBuilder.getPortalUrl("/menuN3Editor")); urls.put("menuN3Editor", urlBuilder.getPortalUrl("/menuN3Editor"));
} }
if (PolicyHelper.isAuthorizedForActions(vreq, new ManageMenus())) {
urls.put("menuManagement", UrlBuilder.getUrl("/individual",
"uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu",
"switchToDisplayModel", "true"));
}
map.put("urls", urls); map.put("urls", urls);
return map; return map;

7
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
View file

@ -14,11 +14,14 @@
</#if> </#if>
<#if siteConfig.urls.menuN3Editor??> <#if siteConfig.urls.menuN3Editor??>
<#-- once new menu management is ready to go, we'll want to add a url for this to siteConfig.urls and remove menu.n3 editor --> <#-- once new menu management is ready to go, we'll want to remove menu.n3 editor -->
<li><a href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true">Menu Management</a> (in development)</li>
<li><a href="${siteConfig.urls.menuN3Editor}">menu.n3 editor</a></li> <li><a href="${siteConfig.urls.menuN3Editor}">menu.n3 editor</a></li>
</#if> </#if>
<#if siteConfig.urls.menuManagement??>
<li><a href="${siteConfig.urls.menuManagement}">Menu Management</a> (in development)</li>
</#if>
<#if siteConfig.urls.userList??> <#if siteConfig.urls.userList??>
<li><a href="${siteConfig.urls.userList}">User accounts</a></li> <li><a href="${siteConfig.urls.userList}">User accounts</a></li>
</#if> </#if>