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

NIHVIVO-2664 Moved the calculation of internalClass URL into the controller. Added check for UseMiscellaneousCuratorPages (review with Jim).

Browse source
This commit is contained in:
cappadona 2011-07-15 12:10:08 +00:00
parent 87661daa9d
commit a0f8144ee8
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.EditIndivi
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.ManageMenus;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.RefreshVisualizationCacheAction;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeSiteAdminPage;
@ -122,21 +123,20 @@ public class SiteAdminController extends FreemarkerHttpServlet {
urls.put("userList", UrlBuilder.getUrl("/accountsAdmin"));
}
if (PolicyHelper.isAuthorizedForActions(vreq, new EditSiteInformation())) {
urls.put("siteInfo", UrlBuilder.getUrl("/editForm", new ParamMap("controller", "ApplicationBean")));
}
// TODO this goes away when Menu Management is complete - jblake
if (PolicyHelper.isAuthorizedForActions(vreq, MenuN3EditController.REQUIRED_ACTIONS)) {
urls.put("menuN3Editor", UrlBuilder.getUrl("/menuN3Editor"));
if (PolicyHelper.isAuthorizedForActions(vreq, new EditSiteInformation())) {
urls.put("siteInfo", UrlBuilder.getUrl("/editForm", new ParamMap("controller", "ApplicationBean")));
}
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"));
}
if (PolicyHelper.isAuthorizedForActions(vreq, new UseMiscellaneousCuratorPages())) {
urls.put("internalClass", UrlBuilder.getUrl("/processInstitutionalInternalClass"));
}
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);
return map;

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

@ -17,7 +17,9 @@
<li><a href="${siteConfig.urls.menuManagement}">Menu management</a></li>
</#if>
<#if siteConfig.urls.internalClass??>
<li><a href="${urls.base}/processInstitutionalInternalClass">Institutional internal class</a></li>
</#if>
<#if siteConfig.urls.userList??>
<li><a href="${siteConfig.urls.userList}">User accounts</a></li>