diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java index 71abe8a3..ccbb8c99 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java @@ -8,8 +8,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.RefreshVisualizationCacheAction; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler; public class SiteAdminController extends BaseSiteAdminController { @@ -21,7 +21,7 @@ public class SiteAdminController extends BaseSiteAdminController { Map urls = super.getIndexCacheRebuildUrls(vreq); - if (PolicyHelper.isAuthorizedForActions(vreq, new RefreshVisualizationCacheAction())) { + if (PolicyHelper.isAuthorizedForActions(vreq, ToolsRequestHandler.REQUIRED_ACTIONS)) { urls.put("rebuildVisCache", UrlBuilder.getUrl("/vis/tools")); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java index ba87189b..ffe180a9 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java @@ -14,8 +14,8 @@ import org.apache.commons.logging.Log; import com.google.gson.Gson; import com.hp.hpl.jena.query.Dataset; +import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.RefreshVisualizationCacheAction; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -30,7 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequ public class ModelConstructorRequestHandler implements VisualizationRequestHandler { - public static final Actions REQUIRED_ACTIONS = new Actions(new RefreshVisualizationCacheAction()); + public static final Actions REQUIRED_ACTIONS = SimplePermission.REFRESH_VISUALIZATION_CACHE.ACTIONS; @Override public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log, diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java index ad98f7f0..b0a62de6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/tools/ToolsRequestHandler.java @@ -9,8 +9,8 @@ import org.apache.commons.logging.Log; import com.hp.hpl.jena.query.Dataset; +import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.RefreshVisualizationCacheAction; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; @@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequ public class ToolsRequestHandler implements VisualizationRequestHandler { - public static final Actions REQUIRED_ACTIONS = new Actions(new RefreshVisualizationCacheAction()); + public static final Actions REQUIRED_ACTIONS = SimplePermission.REFRESH_VISUALIZATION_CACHE.ACTIONS; @Override public Object generateAjaxVisualization(VitroRequest vitroRequest, Log log,