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

VIVO-224 Change USE_MISCELLANEOUS_EDITOR_PAGES to USE_INDIVIDUAL_CONTROL_PANEL

Browse source 
It’s hardly miscellaneous if there’s only one page.
This commit is contained in:
j2blake 2014-01-03 15:40:52 -05:00
parent 03dfbfc2c5
commit f6bd5804d5
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/rdf/auth/everytime/permission_config.n3
View file

@ -43,7 +43,7 @@ auth:ADMIN
auth:hasPermission simplePermission:SeeIndividualEditingPanel ; auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
auth:hasPermission simplePermission:SeeRevisionInfo ; auth:hasPermission simplePermission:SeeRevisionInfo ;
auth:hasPermission simplePermission:SeeSiteAdminPage ; auth:hasPermission simplePermission:SeeSiteAdminPage ;
auth:hasPermission simplePermission:UseMiscellaneousEditorPages ; auth:hasPermission simplePermission:UseIndividualControlPanel ;
auth:hasPermission simplePermission:PageViewableEditor ; auth:hasPermission simplePermission:PageViewableEditor ;
# permissions for ANY logged-in user. # permissions for ANY logged-in user.
@ -80,7 +80,7 @@ auth:CURATOR
auth:hasPermission simplePermission:SeeIndividualEditingPanel ; auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
auth:hasPermission simplePermission:SeeRevisionInfo ; auth:hasPermission simplePermission:SeeRevisionInfo ;
auth:hasPermission simplePermission:SeeSiteAdminPage ; auth:hasPermission simplePermission:SeeSiteAdminPage ;
auth:hasPermission simplePermission:UseMiscellaneousEditorPages ; auth:hasPermission simplePermission:UseIndividualControlPanel ;
auth:hasPermission simplePermission:PageViewableEditor ; auth:hasPermission simplePermission:PageViewableEditor ;
# permissions for ANY logged-in user. # permissions for ANY logged-in user.
@ -110,7 +110,7 @@ auth:EDITOR
auth:hasPermission simplePermission:SeeIndividualEditingPanel ; auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
auth:hasPermission simplePermission:SeeRevisionInfo ; auth:hasPermission simplePermission:SeeRevisionInfo ;
auth:hasPermission simplePermission:SeeSiteAdminPage ; auth:hasPermission simplePermission:SeeSiteAdminPage ;
auth:hasPermission simplePermission:UseMiscellaneousEditorPages ; auth:hasPermission simplePermission:UseIndividualControlPanel ;
auth:hasPermission simplePermission:PageViewableEditor ; auth:hasPermission simplePermission:PageViewableEditor ;
# permissions for ANY logged-in user. # permissions for ANY logged-in user.

4
webapp/rdf/display/everytime/permissions.n3
View file

@ -133,9 +133,9 @@ action:UseMiscellaneousCuratorPages
rdfs:label "USE_MISCELLANEOUS_CURATOR_PAGES" . rdfs:label "USE_MISCELLANEOUS_CURATOR_PAGES" .
action:UseMiscellaneousEditorPages action:UseIndividualControlPanel
a display:RequiredAction ; a display:RequiredAction ;
rdfs:label "USE_MISCELLANEOUS_EDITOR_PAGES" . rdfs:label "USE_INDIVIDUAL_CONTROL_PANEL" .
action:UseMiscellaneousPages action:UseMiscellaneousPages

4
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
View file

@ -72,6 +72,8 @@ public class SimplePermission extends Permission {
NAMESPACE + "SeeVerbosePropertyInformation"); NAMESPACE + "SeeVerbosePropertyInformation");
public static final SimplePermission USE_ADVANCED_DATA_TOOLS_PAGES = new SimplePermission( public static final SimplePermission USE_ADVANCED_DATA_TOOLS_PAGES = new SimplePermission(
NAMESPACE + "UseAdvancedDataToolsPages"); NAMESPACE + "UseAdvancedDataToolsPages");
public static final SimplePermission USE_INDIVIDUAL_CONTROL_PANEL = new SimplePermission(
NAMESPACE + "UseIndividualControlPanel");
public static final SimplePermission USE_SPARQL_QUERY_PAGE = new SimplePermission( public static final SimplePermission USE_SPARQL_QUERY_PAGE = new SimplePermission(
NAMESPACE + "UseSparqlQueryPage"); NAMESPACE + "UseSparqlQueryPage");
public static final SimplePermission USE_SPARQL_UPDATE_API = new SimplePermission( public static final SimplePermission USE_SPARQL_UPDATE_API = new SimplePermission(
@ -89,8 +91,6 @@ public class SimplePermission extends Permission {
NAMESPACE + "UseMiscellaneousAdminPages"); NAMESPACE + "UseMiscellaneousAdminPages");
public static final SimplePermission USE_MISCELLANEOUS_CURATOR_PAGES = new SimplePermission( public static final SimplePermission USE_MISCELLANEOUS_CURATOR_PAGES = new SimplePermission(
NAMESPACE + "UseMiscellaneousCuratorPages"); NAMESPACE + "UseMiscellaneousCuratorPages");
public static final SimplePermission USE_MISCELLANEOUS_EDITOR_PAGES = new SimplePermission(
NAMESPACE + "UseMiscellaneousEditorPages");
public static final SimplePermission USE_MISCELLANEOUS_PAGES = new SimplePermission( public static final SimplePermission USE_MISCELLANEOUS_PAGES = new SimplePermission(
NAMESPACE + "UseMiscellaneousPages"); NAMESPACE + "UseMiscellaneousPages");

2
webapp/web/templates/edit/specific/ents_edit.jsp
View file

@ -12,7 +12,7 @@
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> <%@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); request.setAttribute("isEditor", Boolean.TRUE);
} }
%> %>