Author: xlawrence
Date: Tue Jun 19 15:10:45 2007
New Revision: 17640
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17640&repname=
=3Djahia
Log:
Correctly unselect a file in the engine
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/webdav/SelecU=
nselectFile.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/ajax/webdav/=
SelecUnselectFile.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/webdav/SelecUnselectFile.java&rev=3D17=
640&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/ajax/webdav/SelecU=
nselectFile.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/webdav/SelecU=
nselectFile.java Tue Jun 19 15:10:45 2007
@@ -78,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", "");
@@ -85,6 +86,7 @@
engineMap.remove("deniedUsers");
jff.setRealName("");
theField.setObject(jff);
+ responseValue =3D "";
=
} else {
// Select file
@@ -96,13 +98,14 @@
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[] {TableEntry.j=
avascriptDecode(key)}, response);
+ sendResponse(new String[]{"value"}, new String[] {responseValu=
e}, response);
=
} catch (final Exception e) {
logger.error("Unable to process the request !", e);
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=3D17640&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 Tue Jun 19 15:10:45 2007
@@ -142,6 +142,7 @@
window["complexTree_tree1"].getFolderWithKey(window.document.g=
etElementById("addressBar").value);
selectUnselectFile(document.mainForm.file_id.value);
document.mainForm.file_id.value =3D null;
+ document.mainForm.selectedFileName.value =3D "";
return;
}
var path =3D new Array();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
