From f6bd5804d5b88e08df733ab7925f7bf0600c4e70 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Fri, 3 Jan 2014 15:40:52 -0500
Subject: [PATCH] VIVO-224 Change USE_MISCELLANEOUS_EDITOR_PAGES to
 USE_INDIVIDUAL_CONTROL_PANEL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s hardly miscellaneous if there’s only one page.
---
 webapp/rdf/auth/everytime/permission_config.n3              | 6 +++---
 webapp/rdf/display/everytime/permissions.n3                 | 4 ++--
 .../vitro/webapp/auth/permissions/SimplePermission.java     | 4 ++--
 webapp/web/templates/edit/specific/ents_edit.jsp            | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/rdf/auth/everytime/permission_config.n3 b/webapp/rdf/auth/everytime/permission_config.n3
index 2a84a6609..d01e0b602 100644
--- a/webapp/rdf/auth/everytime/permission_config.n3
+++ b/webapp/rdf/auth/everytime/permission_config.n3
@@ -43,7 +43,7 @@ auth:ADMIN
     auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
     auth:hasPermission simplePermission:SeeRevisionInfo ;
     auth:hasPermission simplePermission:SeeSiteAdminPage ;
-    auth:hasPermission simplePermission:UseMiscellaneousEditorPages ;
+    auth:hasPermission simplePermission:UseIndividualControlPanel ;
     auth:hasPermission simplePermission:PageViewableEditor ;
 
     # permissions for ANY logged-in user.
@@ -80,7 +80,7 @@ auth:CURATOR
     auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
     auth:hasPermission simplePermission:SeeRevisionInfo ;
     auth:hasPermission simplePermission:SeeSiteAdminPage ;
-    auth:hasPermission simplePermission:UseMiscellaneousEditorPages ;
+    auth:hasPermission simplePermission:UseIndividualControlPanel ;
     auth:hasPermission simplePermission:PageViewableEditor ;
 
     # permissions for ANY logged-in user.
@@ -110,7 +110,7 @@ auth:EDITOR
     auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
     auth:hasPermission simplePermission:SeeRevisionInfo ;
     auth:hasPermission simplePermission:SeeSiteAdminPage ;
-    auth:hasPermission simplePermission:UseMiscellaneousEditorPages ;
+    auth:hasPermission simplePermission:UseIndividualControlPanel ;
     auth:hasPermission simplePermission:PageViewableEditor ;
 
     # permissions for ANY logged-in user.
diff --git a/webapp/rdf/display/everytime/permissions.n3 b/webapp/rdf/display/everytime/permissions.n3
index 6b22e4e13..cbd6a98fb 100644
--- a/webapp/rdf/display/everytime/permissions.n3
+++ b/webapp/rdf/display/everytime/permissions.n3
@@ -133,9 +133,9 @@ action:UseMiscellaneousCuratorPages
     rdfs:label "USE_MISCELLANEOUS_CURATOR_PAGES" .
 
 
-action:UseMiscellaneousEditorPages
+action:UseIndividualControlPanel
     a display:RequiredAction ;
-    rdfs:label "USE_MISCELLANEOUS_EDITOR_PAGES" .
+    rdfs:label "USE_INDIVIDUAL_CONTROL_PANEL" .
 
 
 action:UseMiscellaneousPages
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
index 600fbe95c..2e5d40ca1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
@@ -72,6 +72,8 @@ public class SimplePermission extends Permission {
 		NAMESPACE + "SeeVerbosePropertyInformation");
 	public static final SimplePermission USE_ADVANCED_DATA_TOOLS_PAGES = new SimplePermission(
 		NAMESPACE + "UseAdvancedDataToolsPages");
+	public static final SimplePermission USE_INDIVIDUAL_CONTROL_PANEL = new SimplePermission(
+		NAMESPACE + "UseIndividualControlPanel");
 	public static final SimplePermission USE_SPARQL_QUERY_PAGE = new SimplePermission(
 		NAMESPACE + "UseSparqlQueryPage");
 	public static final SimplePermission USE_SPARQL_UPDATE_API = new SimplePermission(
@@ -89,8 +91,6 @@ public class SimplePermission extends Permission {
 		NAMESPACE + "UseMiscellaneousAdminPages");
 	public static final SimplePermission USE_MISCELLANEOUS_CURATOR_PAGES = new SimplePermission(
 		NAMESPACE + "UseMiscellaneousCuratorPages");
-	public static final SimplePermission USE_MISCELLANEOUS_EDITOR_PAGES = new SimplePermission(
-		NAMESPACE + "UseMiscellaneousEditorPages");
 	public static final SimplePermission USE_MISCELLANEOUS_PAGES = new SimplePermission(
 		NAMESPACE + "UseMiscellaneousPages");
 
diff --git a/webapp/web/templates/edit/specific/ents_edit.jsp b/webapp/web/templates/edit/specific/ents_edit.jsp
index f6f6ba9b2..6289a03f9 100644
--- a/webapp/web/templates/edit/specific/ents_edit.jsp
+++ b/webapp/web/templates/edit/specific/ents_edit.jsp
@@ -12,7 +12,7 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
 
 <%
-	if (PolicyHelper.isAuthorizedForActions(request, SimplePermission.USE_MISCELLANEOUS_EDITOR_PAGES.ACTIONS)) {
+	if (PolicyHelper.isAuthorizedForActions(request, SimplePermission.USE_INDIVIDUAL_CONTROL_PANEL.ACTIONS)) {
 		request.setAttribute("isEditor", Boolean.TRUE);
 	}
 %>