Author: tdraier
Date: Thu Aug 2 16:41:44 2007
New Revision: 18114
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18114&repname=
=3Djahia
Log:
do not check write access for browsing categories
(port 18064, 17686)
Modified:
trunk/core/src/java/org/jahia/ajax/categories/GetCategoryChildren.java
Modified: trunk/core/src/java/org/jahia/ajax/categories/GetCategoryChildren=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/ajax/categories/GetCategoryChildren.java&rev=3D18114&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/ajax/categories/GetCategoryChildren.java =
(original)
+++ trunk/core/src/java/org/jahia/ajax/categories/GetCategoryChildren.java =
Thu Aug 2 16:41:44 2007
@@ -84,14 +84,6 @@
"Error: Must be logged in and have 'ManageCate=
gories' access");
return null;
}
- } else {
- final JahiaPage currentPage =3D jParams.getPage();
- if (currentUser =3D=3D null || currentPage =3D=3D null || =
!currentPage.checkWriteAccess(currentUser)) {
- logger.warn("Error: Must be logged in and have 'Write'=
access");
- response.sendError(HttpServletResponse.SC_FORBIDDEN,
- "Error: Must be logged in and have 'Write' acc=
ess");
- return null;
- }
}
String key =3D null;
try {
@@ -127,31 +119,37 @@
}
=
// 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);
-
- } else if (isMovecontext) {
- attachCategoryToResp(startingCategory, resp, root, jPa=
rams);
-
- } else if (isPortletCategoriesContext) {
- // we are dealing with portlet
- final List selectedCategories =3D getSelectedPortletsC=
ategories(jParams);
- final List categoriesIsMultipleSrcList =3D getSelected=
PortletsAllsourcesCategories(jParams);
- attachCategoryForPortletToResp(startingCategory, resp,=
root, jParams, selectedCategories,
- categoriesIsMultipleSrcList);
- } 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 + key);
- attachCategoryToResp(startingCategory, resp, root,=
jParams, selectedCategories);
+ 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,=
jParams);
+
+ } else if (isPortletCategoriesContext) {
+ // we are dealing with portlet
+ final List selectedCategories =3D getSelectedPortl=
etsCategories(jParams);
+ final List categoriesIsMultipleSrcList =3D getSele=
ctedPortletsAllsourcesCategories(jParams);
+ attachCategoryForPortletToResp(startingCategory, r=
esp, root, jParams, selectedCategories,
+ categoriesIsMultipleSrcList);
} 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 + key);
+ 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);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
