tdraier 2005/08/30 16:28:06 CEST
Modified files:
core/src/java/org/apache/slide/security
JahiaWebdavSecurity.java
core/src/java/org/jahia/services/webdav DAVFileAccess.java
core/src/webapp/WEB-INF/var/db
default_corporate_portal_templates.values
core/src/webapp/jsp/jahia/engines/filemanager view.jsp
Log:
fixed webdav acl issues
Revision Changes Path
1.9 +20 -6
jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java.diff?r1=1.8&r2=1.9&f=h
1.22 +0 -0
jahia/core/src/java/org/jahia/services/webdav/DAVFileAccess.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/DAVFileAccess.java.diff?r1=1.21&r2=1.22&f=h
1.14 +2 -2
jahia/core/src/webapp/WEB-INF/var/db/default_corporate_portal_templates.values
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/default_corporate_portal_templates.values.diff?r1=1.13&r2=1.14&f=h
1.5 +1 -1
jahia/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp.diff?r1=1.4&r2=1.5&f=h
Index: JahiaWebdavSecurity.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JahiaWebdavSecurity.java 24 Aug 2005 16:25:14 -0000 1.8
+++ JahiaWebdavSecurity.java 30 Aug 2005 14:28:05 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java,v
1.8 2005/08/24 16:25:14 tdraier Exp $
- * $Revision: 1.8 $
- * $Date: 2005/08/24 16:25:14 $
+ * $Header:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/security/JahiaWebdavSecurity.java,v
1.9 2005/08/30 14:28:05 tdraier Exp $
+ * $Revision: 1.9 $
+ * $Date: 2005/08/30 14:28:05 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
* Security helper.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class JahiaWebdavSecurity implements Security {
@@ -531,8 +531,22 @@
while (!granted && !rootObjectReached) {
Uri courUri = namespace.getUri(courObject.getUri());
- Enumeration permissions = courUri.getStore()
- .enumeratePermissions(courUri);
+ Enumeration permissions = null;
+ try {
+ permissions = courUri.getStore()
+ .enumeratePermissions(courUri);
+ } catch (ServiceAccessException e) {
+ Uri parentUri = courUri.getParentUri();
+
+ if (parentUri != null) {
+ courObject = parentUri.getStore()
+ .retrieveObject(parentUri);
+ } else {
+ rootObjectReached = true;
+ }
+
+ continue;
+ }
while (!granted && permissions.hasMoreElements()) {
Index: default_corporate_portal_templates.values
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/default_corporate_portal_templates.values,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- default_corporate_portal_templates.values 22 Aug 2005 11:31:10 -0000
1.13
+++ default_corporate_portal_templates.values 30 Aug 2005 14:28:05 -0000
1.14
@@ -679,7 +679,7 @@
INSERT INTO jahia_sl2_permissions VALUES(1,11,4,NULL,1,0,2);
INSERT INTO jahia_sl2_permissions VALUES(1,11,5,NULL,1,1,1);
INSERT INTO jahia_sl2_permissions VALUES(2,11,3,NULL,1,1,3);
-INSERT INTO jahia_sl2_permissions VALUES(2,11,4,NULL,1,1,2);
+INSERT INTO jahia_sl2_permissions VALUES(2,11,4,NULL,1,0,2);
INSERT INTO jahia_sl2_permissions VALUES(2,11,5,NULL,1,1,1);
INSERT INTO jahia_sl2_permissions VALUES(6,11,3,NULL,1,1,6);
INSERT INTO jahia_sl2_permissions VALUES(6,11,4,NULL,1,0,5);
@@ -698,4 +698,4 @@
INSERT INTO jahia_sl2_permissions VALUES(10,11,5,NULL,1,1,2);
INSERT INTO jahia_sl2_permissions VALUES(10,12,3,NULL,1,1,4);
INSERT INTO jahia_sl2_permissions VALUES(10,12,4,NULL,1,1,6);
-INSERT INTO jahia_sl2_permissions VALUES(10,12,5,NULL,1,1,5)
+INSERT INTO jahia_sl2_permissions VALUES(10,12,5,NULL,1,1,5);
Index: view.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- view.jsp 5 Jul 2005 15:46:46 -0000 1.4
+++ view.jsp 30 Aug 2005 14:28:06 -0000 1.5
@@ -177,7 +177,7 @@
if
(tableEntry.getEncodedName().equals(request.getSession().getAttribute(jParams.getSiteID()+"-filepicker-selecteddir")))
{
style += "font-weight: bold;";
};
- %><span style="<%=style%>"><% if (tableEntry.isCanWrite() &&
tableEntry.isCanAdmin()) { %><a
href="javascript:selectFile('<%=tableEntry.getEncodedName()%>')" ><%= name
%></a><% } else { %><%=tableEntry.getName()%><% } %></span>
+ %><span style="<%=style%>"><% if (tableEntry.isCanWrite()) { %><a
href="javascript:selectFile('<%=tableEntry.getEncodedName()%>')" ><%= name
%></a><% } else { %><%=tableEntry.getName()%><% } %></span>
</td>
</tr>
