svn commit: [jahia] r18777 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: java/org/jahia/engines/shared/DAVFile_Field.java webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp

[knguyen]

Author: knguyen
Date: Mon Oct  8 14:07:49 2007
New Revision: 18777

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18777&repname=
=3Djahia
Log:
JAHIA-2276 : File Manager integrity warning problem while unselecting a fil=
e + in multilang

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/DAV=
File_Field.java
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/DAVFile_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/DAVFile_Field.java&rev=3D187=
77&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/engines/shared/DAV=
File_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/DAV=
File_Field.java Mon Oct  8 14:07:49 2007
@@ -25,6 +25,7 @@
 import org.jahia.data.files.JahiaFileField;
 import org.jahia.engines.JahiaEngine;
 import org.jahia.engines.JahiaEngineTools;
+import org.jahia.engines.EngineLanguageHelper;
 import org.jahia.engines.filemanager.DAVFilemanager_Engine;
 import org.jahia.engines.filemanager.TableEntry;
 import org.jahia.exceptions.JahiaException;
@@ -144,6 +145,19 @@
         theField.setValue(fileID);
         theField.setObject(fField);
 =

+        final String fieldsEditCallingEngineName =3D (String) engineMap.ge=
t("fieldsEditCallingEngineName");
+        final JahiaContainer theContainer =3D (JahiaContainer) engineMap.g=
et(fieldsEditCallingEngineName + "."
+                + "theContainer");
+        if (objectDav.isValid()) {
+            engineMap.put("deniedUsers", objectDav.comparePermsWithField(t=
heField, theContainer));
+            engineMap.put("canAdmin", Boolean.valueOf(objectDav.hasPermiss=
ion(DAVFileAccess.MANAGE)));
+            jParams.setParameter("select-file", TableEntry.javascriptEncod=
e(objectDav.getPath()));
+        } else {
+            jParams.setParameter("select-file", JahiaConstants.NULL_STRING=
_MARKER);
+            engineMap.remove("deniedUsers");
+            engineMap.remove("canAdmin");
+        }
+
         //logger.debug ("activefolderID=3D" + activeFolderID );
         engineMap.put("fileID", fileID);
 =

@@ -174,10 +188,17 @@
 =

         //logger.debug ("getFormData for " +  jParams.getEngine() + " file=
Title is " + fileTitle);
 =

-        if (jParams.getParameter("ignoreWarnings") =3D=3D null) {
+        if (jParams.getParameter(<% if (request.getParameter("ignoreWarnin=
gs")!=3Dnull){%>checked<%}%>) =3D=3D null) {
             if (engineMap.containsKey("deniedUsers") && ! "cancel".equals(=
jParams.getParameter("screen"))) {
                 final Set deniedUsers =3D (Set) engineMap.get("deniedUsers=
");
-                if (deniedUsers.size() > 0) return false;
+                if (deniedUsers.size() > 0) {
+                    composeFileField(jParams, engineMap, theField);
+                    final EngineLanguageHelper elh =3D (EngineLanguageHelp=
er)
+                            engineMap.get(JahiaEngine.ENGINE_LANGUAGE_HELP=
ER);
+                    jParams.setParameter (EngineLanguageHelper.ENGINE_LANG=
_PARAM,elh.getPreviousLanguageCode());
+                    elh.update(jParams);
+                    return false;
+                }
             }
         }
 =


Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/embedded_filemanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp&r=
ev=3D18777&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/engines/shared/e=
mbedded_filemanager.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.jsp Mon Oct  8 14:07:49 2007
@@ -563,7 +563,7 @@
 <jahia:engineResourceBundle resourceName=3D"org.jahia.bin.JahiaErrorDispla=
y.error.label"/>
 </span>
 <% if (jParams.getUser().isAdminMember(jParams.getSiteID())) { %>
-&nbsp;<input type=3D"checkbox" name=3D"ignoreWarnings" />&nbsp;<jahia:engi=
neResourceBundle
+&nbsp;<input type=3D"checkbox" name=3D"ignoreWarnings" <% if (request.getP=
arameter("ignoreWarnings")!=3Dnull){%>checked<%}%> />&nbsp;<jahia:engineRes=
ourceBundle
         resourceName=3D"org.jahia.engines.shared.BigText_Field.ignoreWarni=
ng.label"/>
 <% } %>
 <br/>&nbsp;<br/>

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list