diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java index 63085234e..4df475e8b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/UseRestrictedPagesByRoleLevelPolicy.java @@ -15,16 +15,16 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAct import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.SeeRevisionInfo; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseBasicAjaxControllers; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseEditUserAccountsPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseIndividualEditorPages; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMenuEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageMenus; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousAdminPages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMiscellaneousCuratorPages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseOntologyEditorPages; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UsePortalEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseSiteAdminPage; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseSiteInfoEditingPage; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseTabEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; /** @@ -51,10 +51,10 @@ public class UseRestrictedPagesByRoleLevelPolicy implements PolicyIface { if (whatToAuth instanceof UseAdvancedDataToolsPages) { result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole); - } else if (whatToAuth instanceof UseEditUserAccountsPages) { + } else if (whatToAuth instanceof ManageUserAccounts) { result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole); - } else if (whatToAuth instanceof UseMenuEditorPages) { + } else if (whatToAuth instanceof ManageMenus) { result = isAuthorized(whatToAuth, RoleLevel.DB_ADMIN, userRole); } else if (whatToAuth instanceof UseMiscellaneousAdminPages) { @@ -63,10 +63,10 @@ public class UseRestrictedPagesByRoleLevelPolicy implements PolicyIface { } else if (whatToAuth instanceof UseOntologyEditorPages) { result = isAuthorized(whatToAuth, RoleLevel.CURATOR, userRole); - } else if (whatToAuth instanceof UsePortalEditorPages) { + } else if (whatToAuth instanceof ManagePortals) { result = isAuthorized(whatToAuth, RoleLevel.CURATOR, userRole); - } else if (whatToAuth instanceof UseTabEditorPages) { + } else if (whatToAuth instanceof ManageTabs) { result = isAuthorized(whatToAuth, RoleLevel.CURATOR, userRole); } else if (whatToAuth instanceof UseSiteInfoEditingPage) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseMenuEditorPages.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageMenus.java similarity index 82% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseMenuEditorPages.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageMenus.java index 125288bb4..d6419e39d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseMenuEditorPages.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageMenus.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; /** Should we allow the user to use the pages for editing menus? */ -public class UseMenuEditorPages extends RequestedAction implements +public class ManageMenus extends RequestedAction implements UsePagesRequestedAction { // no fields } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UsePortalEditorPages.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManagePortals.java similarity index 81% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UsePortalEditorPages.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManagePortals.java index e91a75442..3c6fb8cc1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UsePortalEditorPages.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManagePortals.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; /** Should we allow the user to use the pages for editing portals? */ -public class UsePortalEditorPages extends RequestedAction implements +public class ManagePortals extends RequestedAction implements UsePagesRequestedAction { // no fields } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseTabEditorPages.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageTabs.java similarity index 82% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseTabEditorPages.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageTabs.java index 31487a858..292ca7029 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseTabEditorPages.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageTabs.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; /** Should we allow the user to use the pages for editing tabs? */ -public class UseTabEditorPages extends RequestedAction implements +public class ManageTabs extends RequestedAction implements UsePagesRequestedAction { // no fields } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseEditUserAccountsPages.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageUserAccounts.java similarity index 65% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseEditUserAccountsPages.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageUserAccounts.java index fd131acc9..9c1bf0761 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UseEditUserAccountsPages.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageUserAccounts.java @@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction; -/** Should we allow the user to edit user accounts? */ -public class UseEditUserAccountsPages extends RequestedAction implements +/** Should we allow the user to create, edit, or delete user accounts? */ +public class ManageUserAccounts extends RequestedAction implements UsePagesRequestedAction { // no fields } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalRetryController.java index cd6256e4b..efe082689 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalRetryController.java @@ -24,7 +24,7 @@ import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.listener.ChangeListener; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UsePortalEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; @@ -39,7 +39,7 @@ public class PortalRetryController extends BaseEditController { @Override public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, new Actions(new UsePortalEditorPages()))) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManagePortals()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabEditController.java index 5776633e5..ed3e38d15 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabEditController.java @@ -23,7 +23,7 @@ import edu.cornell.mannlib.vedit.beans.FormObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseTabEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Tab; @@ -46,7 +46,7 @@ public class TabEditController extends BaseEditController { @Override public void doPost (HttpServletRequest request, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseTabEditorPages()))) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new ManageTabs()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabHierarchyOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabHierarchyOperationController.java index d24e36f39..b816f2a83 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabHierarchyOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabHierarchyOperationController.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseTabEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs; import edu.cornell.mannlib.vitro.webapp.beans.Tab; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.TabDao; @@ -24,7 +24,7 @@ public class TabHierarchyOperationController extends BaseEditController { @Override public void doPost(HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseTabEditorPages()))) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManageTabs()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabRetryController.java index 4b7031329..17047c9b8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabRetryController.java @@ -22,7 +22,7 @@ import edu.cornell.mannlib.vedit.forwarder.PageForwarder; import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseTabEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Tab; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -39,7 +39,7 @@ public class TabRetryController extends BaseEditController { @Override public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseTabEditorPages()))) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManageTabs()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TabsRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TabsRetryController.java index c8744a16f..be488e27f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TabsRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Tabs2TabsRetryController.java @@ -19,7 +19,7 @@ import edu.cornell.mannlib.vedit.beans.Option; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseTabEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Tab; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -32,7 +32,7 @@ public class Tabs2TabsRetryController extends BaseEditController { @Override public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseTabEditorPages()))) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManageTabs()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserEditController.java index b5195c9fa..786c130b1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserEditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserEditController.java @@ -15,7 +15,7 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseEditUserAccountsPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; @@ -42,7 +42,7 @@ public class UserEditController extends BaseEditController { @Override public void doPost (HttpServletRequest request, HttpServletResponse response) throws ServletException { - if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseEditUserAccountsPages()))) { + if (!isAuthorizedToDisplayPage(request, response, new Actions(new ManageUserAccounts()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java index d0d210537..44476fb51 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserRetryController.java @@ -29,7 +29,7 @@ import edu.cornell.mannlib.vedit.validator.ValidationObject; import edu.cornell.mannlib.vedit.validator.Validator; import edu.cornell.mannlib.vitro.webapp.auth.policy.setup.SelfEditingPolicySetup; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseEditUserAccountsPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -43,7 +43,7 @@ public class UserRetryController extends BaseEditController { @Override public void doPost (HttpServletRequest req, HttpServletResponse response) { - if (!isAuthorizedToDisplayPage(req, response, new Actions(new UseEditUserAccountsPages()))) { + if (!isAuthorizedToDisplayPage(req, response, new Actions(new ManageUserAccounts()))) { return; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllTabsForPortalListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllTabsForPortalListingController.java index 105cc2e69..7cb66323a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllTabsForPortalListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllTabsForPortalListingController.java @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseTabEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageTabs; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.Tab; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.TabDao; public class AllTabsForPortalListingController extends BaseEditController { - public static final Actions REQUIRED_ACTIONS = new Actions(new UseTabEditorPages()); + public static final Actions REQUIRED_ACTIONS = new Actions(new ManageTabs()); private static final int NUM_COLS = 11; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PortalsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PortalsListingController.java index 8b26fd0c3..15363a696 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PortalsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PortalsListingController.java @@ -11,14 +11,14 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UsePortalEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManagePortals; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.PortalDao; public class PortalsListingController extends BaseEditController { - public static final Actions REQUIRED_ACTIONS = new Actions(new UsePortalEditorPages()); + public static final Actions REQUIRED_ACTIONS = new Actions(new ManagePortals()); @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/UsersListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/UsersListingController.java index ff3daafd1..df4c8b2ae 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/UsersListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/UsersListingController.java @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseEditUserAccountsPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageUserAccounts; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; @@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.UserDao; public class UsersListingController extends BaseEditController { - public static final Actions REQUIRED_ACTIONS = new Actions(new UseEditUserAccountsPages()); + public static final Actions REQUIRED_ACTIONS = new Actions(new ManageUserAccounts()); private String[] roleNameStr = new String[51]; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuN3EditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuN3EditController.java index d8f7b235a..f98a40ec7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuN3EditController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuN3EditController.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseMenuEditorPages; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageMenus; 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 @@ public class MenuN3EditController extends FreemarkerHttpServlet { protected final static String N3_PARAM = "navigationN3"; - public final static Actions REQUIRED_ACTIONS = new Actions(new UseMenuEditorPages()); + public final static Actions REQUIRED_ACTIONS = new Actions(new ManageMenus()); @Override protected Actions requiredActions(VitroRequest vreq) {