Author: knguyen
Date: Tue Oct 9 10:17:40 2007
New Revision: 18788
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18788&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=
88&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 Oct 9 10:17:40 2007
@@ -291,6 +291,8 @@
jParams.setParameter("select-file", TableEntry.javascriptEncod=
e(rm.getPath()));
} else {
jParams.setParameter("select-file", JahiaConstants.NULL_STRING=
_MARKER);
+ engineMap.remove("deniedUsers");
+ engineMap.remove("canAdmin");
}
=
if (logger.isDebugEnabled()) {
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=3D18788&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 Oct 9 10:17:40 2007
@@ -228,6 +228,10 @@
"<jahia:serverHttpPath/>/ajaxaction/SelecUnselectFile?para=
ms=3D/op/edit/pid/<%=3DjParams.getPageID()%>");
delete jahiaCommand;
delete xmlDoc;
+ var errorDisplayEl =3D document.getElementById("errorsDisplay");
+ if ( errorDisplayEl !=3D undefined ){
+ errorDisplayEl.style.display =3D "none"; =
+ }
}
=
function selectCallback(msg) {
@@ -563,7 +567,7 @@
final Set deniedUsers =3D (Set) engineMap.get("deniedUsers");
if (deniedUsers !=3D null && deniedUsers.size() > 0) {
%>
-
+<div id=3D"errorsDisplay">
<span class=3D"errorbold">
<jahia:engineResourceBundle resourceName=3D"org.jahia.bin.JahiaErrorDispla=
y.error.label"/>
</span>
@@ -590,6 +594,7 @@
</ul>
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanager.=
Filemanager_Engine.changePermOrSelectOther.label"/>
</span>
+</div>
<% } %>
=
<br/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
