Author: xlawrence
Date: Wed Jun 27 16:32:18 2007
New Revision: 17804
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17804&repname=
=3Djahia
Log:
backport fix on correct select / unselect of file in the file field engine
Modified:
trunk/core/src/java/org/jahia/ajax/webdav/SelecUnselectFile.java
Modified: trunk/core/src/java/org/jahia/ajax/webdav/SelecUnselectFile.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/ajax/webdav/SelecUnselectFile.java&rev=3D17804&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
--- trunk/core/src/java/org/jahia/ajax/webdav/SelecUnselectFile.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/ajax/webdav/SelecUnselectFile.java Wed Ju=
n 27 16:32:18 2007
@@ -28,6 +28,7 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.data.files.JahiaFileField;
import org.jahia.data.containers.JahiaContainer;
+import org.jahia.engines.filemanager.TableEntry;
=
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -77,6 +78,7 @@
final JahiaField theField =3D (JahiaField) engineMap.get(field=
sEditCallingEngineName + ".theField");
final JahiaFileField jff =3D (JahiaFileField) theField.getObje=
ct();
=
+ final String responseValue;
if (key.equals(currentFileName)) {
// Unselect file
engineMap.put("filename", "");
@@ -84,6 +86,7 @@
engineMap.remove("deniedUsers");
jff.setRealName("");
theField.setObject(jff);
+ responseValue =3D "";
=
} else {
// Select file
@@ -95,12 +98,15 @@
jParams.getUser(), key);
engineMap.put("deniedUsers", rm.comparePermsWithField(theF=
ield,
(JahiaContainer) engineMap.get("theContainer")));
+ responseValue =3D TableEntry.javascriptDecode(key);
}
=
engineMap.put(fieldsEditCallingEngineName + ".theField", theFi=
eld);
logger.info("selected File is: " + engineMap.get("filename"));
session.setAttribute("jahia_session_engineMap", engineMap);
=
+ sendResponse(new String[]{"value"}, new String[] {responseValu=
e}, response);
+
} catch (final Exception e) {
logger.error("Unable to process the request !", e);
if (! response.isCommitted()) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
