cvs commit: jahia/core/src/java/org/jahia/engines/shared DAVFile_Field.java jahia/core/src/webapp/jsp/jahia/engines/shared embedded_flat_filemanager.jsp

[Thomas Draier]

tdraier     2005/10/11 11:57:23 CEST

  Modified files:
    core/src/java/org/jahia/engines/shared DAVFile_Field.java 
    core/src/webapp/jsp/jahia/engines/shared 
                                             embedded_flat_filemanager.jsp 
  Log:
  fix issue with fixrights button
  
  Revision  Changes    Path
  1.13      +8 -6      
jahia/core/src/java/org/jahia/engines/shared/DAVFile_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/DAVFile_Field.java.diff?r1=1.12&r2=1.13&f=h
  1.20      +0 -11     
jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp.diff?r1=1.19&r2=1.20&f=h
  
  
  
  Index: DAVFile_Field.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/DAVFile_Field.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DAVFile_Field.java        5 Oct 2005 15:17:29 -0000       1.12
  +++ DAVFile_Field.java        11 Oct 2005 09:57:22 -0000      1.13
  @@ -111,8 +111,8 @@
           //logger.debug ("activefolderID=" + activeFolderID );
           engineMap.put("fileID", fileID);
   
  -        String fixRights = jParams.getParameter("fixrights");
  -        if (fixRights != null && fixRights.equals("on")) {
  +//        String fixRights = jParams.getParameter("fixrights");
  +//        if (fixRights != null && fixRights.equals("on")) {
               Set uris = new HashSet();
               String[] users = jParams.getParameterValues("user");
               if (users != null) {
  @@ -120,10 +120,12 @@
                       uris.add(users[i]);
                   }
               }
  -            objectDav.beginTransaction();
  -            objectDav.alignPermsWithField(theField, uris);
  -            objectDav.commitTransaction();
  -        }
  +            if (!uris.isEmpty()) {
  +                objectDav.beginTransaction();
  +                objectDav.alignPermsWithField(theField, uris);
  +                objectDav.commitTransaction();
  +            }
  +//        }
   
           //logger.debug ("getFormData for " +  jParams.getEngine() + " 
fileTitle is " + fileTitle);
   
  
  
  
  Index: embedded_flat_filemanager.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.jsp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- embedded_flat_filemanager.jsp     6 Oct 2005 13:31:44 -0000       1.19
  +++ embedded_flat_filemanager.jsp     11 Oct 2005 09:57:23 -0000      1.20
  @@ -79,12 +79,6 @@
           window.open( "<%= request.getContextPath() %>/webdav/site/<%= 
jParams.getSiteKey() %>" + path, "Preview", params);
       }
   
  -    function fixRights() {
  -        document.mainForm.action = "<%=engineUrl%>" + "?screen=apply";
  -        document.mainForm.fixrights.value = "on";
  -        document.mainForm.submit();
  -    }
  -
       var selected = new Array;
       var colors = new Array;
   
  @@ -294,11 +288,6 @@
               }
           }
       %>
  -    <tr>
  -        <td colspan="2" align="right"><a href="javascript:fixRights()"
  -                ><img name="Manage3" alt=""
  -                      
src="<jahia:serverHttpPath/><jahia:engineResourceBundle 
resourceName="org.jahia.applyOff.button"/>"
  -                      border="0"></a></td></tr>
   </table>
   <%
           }