Author: sshyrkov
Date: Tue Sep 25 09:47:31 2007
New Revision: 18638

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18638&repname=
=3Djahia
Log:
DOC-214: SP3: problem with the current selected file between the global fil=
e managr and a file field =

http://www.jahia.net/jira/browse/DOC-214
Resolution: session attribute properly cleared now

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

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=3D186=
38&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 Tue Sep 25 09:47:31 2007
@@ -86,8 +86,10 @@
         final String fieldsEditCallingEngineName =3D (String) engineMap.ge=
t("fieldsEditCallingEngineName");
         final JahiaField theField =3D (JahiaField) engineMap.get(fieldsEdi=
tCallingEngineName + "." + "theField");
         engineMap.put("filemanagerUrl", jParams.composeEngineUrl("filemana=
ger", ""));
-        logger.debug("FieldID: " + theField.getID());
-        logger.debug("mode is: " + mode);
+        if  (logger.isDebugEnabled()) {
+            logger.debug("FieldID: " + theField.getID());
+            logger.debug("mode is: " + mode);
+        }
 =

         if (mode !=3D JahiaEngine.SAVE_MODE) {
             final String theScreen =3D jParams.getParameter("screen");
@@ -229,6 +231,7 @@
             jParams.getSessionState().removeAttribute(jParams.getSiteID() =
+ "-justUploaded");
             //getFormData(jParams, engineMap, theField);
         }
+        jParams.getSessionState().removeAttribute("selectedFile");
         final JahiaFileField fField =3D composeFileField(jParams, engineMa=
p, theField);
         final String fieldsEditCallingEngineName =3D (String) engineMap.ge=
t("fieldsEditCallingEngineName");
 =

@@ -269,7 +272,9 @@
             jParams.setParameter("select-file", JahiaConstants.NULL_STRING=
_MARKER);
         }
 =

-        logger.debug("select-file: " + jParams.getParameter("select-file")=
);
+        if  (logger.isDebugEnabled()) {
+            logger.debug("select-file: " + jParams.getParameter("select-fi=
le"));
+        }
 =

         final List hiddenEntries =3D new ArrayList();
 =


_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to