Author: ktlili
Date: Thu Jun 21 12:12:19 2007
New Revision: 17686
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17686&repname=
=3Djahia
Log:
- fix JAHIA-2011, no access on root category bug:
1- remove NPE
2- don't display import and categories tree if current user has no access o=
n root
3- add "no readd access on root category" message
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_de.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_es.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_it.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_pt.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/categories/Ge=
tCategoryChildren.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_categories.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources.properties&rev=3D17=
686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties Thu Jun 21 12:12:19 2007
@@ -1074,6 +1074,7 @@
org.jahia.actions.sites.*.engines.languages.italian.label =3D Italian
org.jahia.actions.server.admin.permissions.ManageServerPermissions.label=
=3DServer permission management
org.jahia.actions.server.admin.categories.ManageCategories.label=3DCategor=
ies management
+org.jahia.actions.server.admin.categories.ManageCategories.rootAccessDenie=
d =3D No read access on root category
org.jahia.actions.server.admin.sites.ManageSites.label=3DVirtual site mana=
gement
org.jahia.actions.server.admin.components.ManageComponentRights.label=3DMa=
nage rights on portlets
org.jahia.actions.server.admin.htmleditors.HtmlEditorsAdmin.label=3DHTML e=
ditor and validation
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_de.properties&rev=
=3D17686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_de.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_de.properties Thu Jun 21 12:12:19 2007
@@ -1048,6 +1048,7 @@
org.jahia.actions.sites.*.engines.languages.italian.label =3D Italienisch
org.jahia.actions.server.admin.permissions.ManageServerPermissions.label=
=3DServer-Zugangsverwaltung
org.jahia.actions.server.admin.categories.ManageCategories.label=3DVerwalt=
ung der Kategorien
+org.jahia.actions.server.admin.categories.ManageCategories.rootAccessDenie=
d =3D No read access on root category
org.jahia.actions.server.admin.sites.ManageSites.label=3DVerwaltung der vi=
rtuellen Sites
org.jahia.actions.server.admin.components.ManageComponentRights.label=3DPo=
rtlet-Zugangsrechte verwalten
org.jahia.actions.server.admin.htmleditors.HtmlEditorsAdmin.label=3DHTML-E=
ditor und Validierung
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_en.properties&rev=
=3D17686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties Thu Jun 21 12:12:19 2007
@@ -1074,6 +1074,7 @@
org.jahia.actions.sites.*.engines.languages.italian.label =3D Italian
org.jahia.actions.server.admin.permissions.ManageServerPermissions.label=
=3DServer permission management
org.jahia.actions.server.admin.categories.ManageCategories.label=3DCategor=
ies management
+org.jahia.actions.server.admin.categories.ManageCategories.rootAccessDenie=
d =3D No read access on root category
org.jahia.actions.server.admin.sites.ManageSites.label=3DVirtual site mana=
gement
org.jahia.actions.server.admin.components.ManageComponentRights.label=3DMa=
nage rights on portlets
org.jahia.actions.server.admin.htmleditors.HtmlEditorsAdmin.label=3DHTML e=
ditor and validation
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_es.properties&rev=
=3D17686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_es.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_es.properties Thu Jun 21 12:12:19 2007
@@ -1048,6 +1048,7 @@
org.jahia.actions.sites.*.engines.languages.italian.label =3D Italiano
org.jahia.actions.server.admin.permissions.ManageServerPermissions.label=
=3DAdministraci=C3=B3n de permisos del servidor
org.jahia.actions.server.admin.categories.ManageCategories.label=3DAdminis=
traci=C3=B3n de categor=C3=ADas
+org.jahia.actions.server.admin.categories.ManageCategories.rootAccessDenie=
d =3D No read access on root category
org.jahia.actions.server.admin.sites.ManageSites.label=3DAdministraci=C3=
=B3n de sitios virtuales
org.jahia.actions.server.admin.components.ManageComponentRights.label=3DAd=
ministrar derechos sobre portlets
org.jahia.actions.server.admin.htmleditors.HtmlEditorsAdmin.label=3DEditor=
y validaci=C3=B3n HTML
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properties&rev=
=3D17686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties Thu Jun 21 12:12:19 2007
@@ -540,6 +540,7 @@
org.jahia.admin.serverpermissions.noPrincipals.label=3DPermission accord=
=C3=A9e =C3=A0 aucun utilisateur / groupe
org.jahia.admin.serverpermissions.permission.admin.audit.ManageLogs.label=
=3DLogs d'administration
org.jahia.admin.serverpermissions.permission.admin.categories.ManageCatego=
ries.label=3DG=C3=A9rer les cat=C3=A9gories
+org.jahia.actions.server.admin.categories.ManageCategories.rootAccessDenie=
d =3D Vous n'avez pas le droit de lecture sur la cat=C3=A9gorie root =
org.jahia.admin.serverpermissions.permission.admin.components.ManageShareC=
omponents.label=3DGestion du partage des portlets
org.jahia.admin.serverpermissions.permission.admin.database.ManageDatabase=
.label=3DParam=C3=A8tres de la base de donn=C3=A9es
org.jahia.admin.serverpermissions.permission.admin.htmleditors.HtmlEditors=
Admin.label=3DV=C3=A9rifications et validation du code HTML
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_it.properties&rev=
=3D17686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_it.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_it.properties Thu Jun 21 12:12:19 2007
@@ -398,6 +398,7 @@
org.jahia.admin.serverpermissions.permission.admin.info.LicenseInfo.label=
=3DInformazioni su Jahia
org.jahia.admin.serverpermissions.permission.admin.sites.ManageSites.label=
=3DGestisci siti virtuali
org.jahia.admin.serverpermissions.permission.admin.categories.ManageCatego=
ries.label=3DGestisci categorie
+org.jahia.actions.server.admin.categories.ManageCategories.rootAccessDenie=
d =3D No read access on root category
org.jahia.admin.serverpermissions.permission.admin.server.ManageServer.lab=
el=3DImpostazioni server
org.jahia.admin.serverpermissions.permission.admin.database.ManageDatabase=
.label=3DImpostazioni database
org.jahia.admin.serverpermissions.permission.admin.audit.ManageLogs.label=
=3DAmministrazione registri di controllo
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_pt.properties&rev=
=3D17686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_pt.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_pt.properties Thu Jun 21 12:12:19 2007
@@ -1048,6 +1048,7 @@
org.jahia.actions.sites.*.engines.languages.italian.label =3D Italiano
org.jahia.actions.server.admin.permissions.ManageServerPermissions.label=
=3DGest=C3=A3o de permiss=C3=B5es do servidor
org.jahia.actions.server.admin.categories.ManageCategories.label=3DGest=C3=
=A3o de categorias
+org.jahia.actions.server.admin.categories.ManageCategories.rootAccessDenie=
d =3D No read access on root category
org.jahia.actions.server.admin.sites.ManageSites.label=3DGest=C3=A3o de si=
tes virtuais
org.jahia.actions.server.admin.components.ManageComponentRights.label=3DGe=
rir direitos sobre portlets
org.jahia.actions.server.admin.htmleditors.HtmlEditorsAdmin.label=3DEdi=C3=
=A7=C3=A3o e valida=C3=A7=C3=A3o de HTML
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/categor=
ies/GetCategoryChildren.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/categories/GetCategoryChildren.java&re=
v=3D17686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/categories/Ge=
tCategoryChildren.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/categories/Ge=
tCategoryChildren.java Thu Jun 21 12:12:19 2007
@@ -113,25 +113,31 @@
final boolean isMovecontext =3D move.length() > 0;
if (key =3D=3D null || startingCategory !=3D null || "/".equal=
s(key) || key.length() =3D=3D 0) {
// Append the root category only and stop
- if (startingCategory =3D=3D null) startingCategory =3D Cat=
egory.getRootCategory(currentUser);
- if (isAdmincontext) {
- attachCategoryforAdminToResp(startingCategory, resp, r=
oot, currentUser, jParams,
- request, response);
+ if (startingCategory =3D=3D null){
+ startingCategory =3D Category.getRootCategory(currentU=
ser);
+ }
+ if(startingCategory !=3D null){
+ if (isAdmincontext) {
+ attachCategoryforAdminToResp(startingCategory, res=
p, root, currentUser, jParams,
+ request, response);
=
- } else if (isMovecontext) {
- attachCategoryToResp(startingCategory, resp, root, jPa=
rams);
+ } else if (isMovecontext) {
+ attachCategoryToResp(startingCategory, resp, root,=
jParams);
=
- } else {
- if (objectKey.startsWith("/")) {
- // we are dealing with a DAV resource
- final List selectedCategories =3D (List) request.g=
etSession().getAttribute(
- TableEntry.javascriptDecode(objectKey) + C=
ategory_Field.SELECTEDCATEGORIES_ENGINEMAPKEY);
- attachCategoryToResp(startingCategory, resp, root,=
jParams, selectedCategories);
} else {
- // we are dealing with a JahiaObject
- final List selectedCategories =3D getSelectedCateg=
ories(jParams);
- attachCategoryToResp(startingCategory, resp, root,=
jParams, selectedCategories);
+ if (objectKey.startsWith("/")) {
+ // we are dealing with a DAV resource
+ final List selectedCategories =3D (List) reque=
st.getSession().getAttribute(
+ TableEntry.javascriptDecode(objectKey)=
+ Category_Field.SELECTEDCATEGORIES_ENGINEMAPKEY);
+ attachCategoryToResp(startingCategory, resp, r=
oot, jParams, selectedCategories);
+ } else {
+ // we are dealing with a JahiaObject
+ final List selectedCategories =3D getSelectedC=
ategories(jParams);
+ attachCategoryToResp(startingCategory, resp, r=
oot, jParams, selectedCategories);
+ }
}
+ }else{
+ logger.debug("User["+currentUser+"] has no read access=
on root category");
}
resp.appendChild(root);
sendResponse(resp, response);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/manage_categories.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/manage_categories.jsp&rev=
=3D17686&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_categories.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_categories.jsp Thu Jun 21 12:12:19 2007
@@ -1,5 +1,7 @@
<%@ page import=3D"org.jahia.taglibs.ajax.ComplexTreeInclude" %>
<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle" %>
+<%@ page import=3D"org.jahia.services.categories.Category" %>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
<%--
Copyright 2002-2006 Jahia Ltd
=
@@ -71,10 +73,17 @@
method=3D"post">
<% final String title =3D JahiaResourceBundle.getEngineResourc=
e("org.jahia.engines.title.label",
jData.getProcessingContext(), jData.getProcessingConte=
xt().getLocale()); %>
- <ajax:complexTreeInclude divID=3D"tree1"
+ <% final JahiaUser currentUser =3D jData.getProcessingContext(=
).getUser();
+ final boolean hasRootCategoryAccess =3D Category.getRootCat=
egory(currentUser) !=3D null;
+ if (hasRootCategoryAccess ) { %>
+
+ <ajax:complexTreeInclude divID=3D"tree1"
style=3D"<%=3DComplexTreeInclude.ADMI=
N_CATEGORY_STYLE%>"
title=3D"<%=3Dtitle%>"
entryPointKey=3D"/"/>
+ <%}else {%>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.acti=
ons.server.admin.categories.ManageCategories.rootAccessDenied"/>
+ <%}%>
</form>
<form name=3D"importForm"
action=3D'<%=3DJahiaAdministration.composeActionURL(request,=
response,"categories","&sub=3Dimport")%>'
@@ -85,6 +94,7 @@
:
</div>
<ul id=3D"operationList">
+ <%if (hasRootCategoryAccess ) {%>
<li style=3D"list-style:none;">
<table>
<tr>
@@ -102,8 +112,8 @@
</td>
</tr>
</table>
-
</li>
+ <%}%>
<li>
<a href=3D'<%=3DjData.getProcessingContext().compo=
seSiteUrl(jData.getProcessingContext().getSite()) + "/engineName/export/cat=
egories.xml?exportformat=3Dcats" %>'
title=3D"<jahia:adminResourceBundle resourceNam=
e=3D"org.jahia.admin.site.ManageSites.export.label"/>">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
