Author: tdraier
Date: Fri Jun 29 17:48:16 2007
New Revision: 17841
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17841&repname=
=3Djahia
Log:
display correct error message when moving folder taht contains locked files=
( JAHIA-2016 )
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/DA=
VFileAccess.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D17841&rep=
name=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/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Fri Jun 29 17:48:16 2007
@@ -745,6 +745,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.unlockFile.label =3D Unlo=
ck file
org.jahia.engines.filemanager.Filemanager_Engine.unlockText.label =3D is c=
urrently locked by user
org.jahia.engines.filemanager.Filemanager_Engine.forceUnlock.label =3D Nev=
ertheless, You can unlock the file if you check the following checkbox
+org.jahia.engines.filemanager.Filemanager_Engine.containsLockedFile.label =
=3D This folder contains locked files
org.jahia.engines.filemanager.Filemanager_Engine.selectFile.label =3D Sele=
ct
org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label =3D Selec=
t target directory
org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label =3D Pre=
view
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D17841&=
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/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Fri Jun 29 17:48:16 2007
@@ -745,6 +745,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.unlockFile.label =3D Unlo=
ck file
org.jahia.engines.filemanager.Filemanager_Engine.unlockText.label =3D is c=
urrently locked by user
org.jahia.engines.filemanager.Filemanager_Engine.forceUnlock.label =3D Nev=
ertheless, You can unlock the file if you check the following checkbox
+org.jahia.engines.filemanager.Filemanager_Engine.containsLockedFile.label =
=3D This folder contains locked files
org.jahia.engines.filemanager.Filemanager_Engine.selectFile.label =3D Sele=
ct
org.jahia.engines.filemanager.Filemanager_Engine.selectDir.label =3D Selec=
t target directory
org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label =3D Pre=
view
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D17841&=
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/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Fri Jun 29 17:48:16 2007
@@ -308,6 +308,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.fixRights.label =3D Vous =
pouvez donner les acc=C3=A8s en lecture sur ce fichier aux utilisateurs/gro=
upes suivants
org.jahia.engines.filemanager.Filemanager_Engine.for.label =3D pour
org.jahia.engines.filemanager.Filemanager_Engine.forceUnlock.label =3D N=
=C3=A9anmoins, vous pouvez d=C3=A9verrouiller le fichier en cochant la case=
suivante
+org.jahia.engines.filemanager.Filemanager_Engine.containsLockedFile.label =
=3D Ce r=C3=A9p=C3=A9rtoire contient des fichiers verrouill=C3=A9s
org.jahia.engines.filemanager.Filemanager_Engine.general.label =3D G=C3=A9=
n=C3=A9ral
org.jahia.engines.filemanager.Filemanager_Engine.getcontentlanguage.label =
=3D Langue du contenu
org.jahia.engines.filemanager.Filemanager_Engine.getcontenttype.label =3D =
Type MIME
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/file=
manager/DAVFilemanager_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.j=
ava&rev=3D17841&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/filemanage=
r/DAVFilemanager_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java Fri Jun 29 17:48:16 2007
@@ -513,6 +513,7 @@
}
} else {
objectDav.rollbackTransaction();
+ jParams.getSessionState().removeAttribute(jParams.getSiteI=
D() + "-act");
if (jParams.getAttribute("error") =3D=3D null) {
jParams.setAttribute("error", "org.jahia.engines.filem=
anager.Filemanager_Engine.filemanagerError.label");
}
@@ -911,9 +912,19 @@
final String dest =3D TableEntry.javascriptDecode(jParams.getParam=
eter("selectDir"));
logger.debug("moveFile " + dav.getPath() + " to: " + dest);
final String path =3D dav.getPath();
+ DAVFileAccess locked =3D dav.containsLockedFiles();
+ if (locked !=3D null) {
+ jParams.setAttribute("error","org.jahia.engines.filemanager.Fi=
lemanager_Engine.containsLockedFile.label");
+ List listOfFiles =3D new ArrayList();
+ listOfFiles.add(locked);
+ jParams.setAttribute("listOfFiles", listOfFiles);
+ return false;
+ }
final boolean b =3D dav.moveFile(dest);
- jParams.getSessionState().setAttribute(jParams.getSiteID() + "-mov=
edfrom", path);
- jParams.getSessionState().setAttribute(jParams.getSiteID() + "-mov=
edto", dav.getPath());
+ if (b) {
+ jParams.getSessionState().setAttribute(jParams.getSiteID() + "=
-movedfrom", path);
+ jParams.getSessionState().setAttribute(jParams.getSiteID() + "=
-movedto", dav.getPath());
+ }
return b;
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/web=
dav/DAVFileAccess.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/webdav/DAVFileAccess.java&rev=3D17=
841&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/services/webdav/DA=
VFileAccess.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/webdav/DA=
VFileAccess.java Fri Jun 29 17:48:16 2007
@@ -34,6 +34,7 @@
import org.apache.slide.macro.DeleteMacroException;
import org.apache.slide.macro.Macro;
import org.apache.slide.macro.MacroException;
+import org.apache.slide.macro.CopyMacroException;
import org.apache.slide.security.NodePermission;
import org.apache.slide.security.Security;
import org.apache.slide.structure.*;
@@ -2036,6 +2037,19 @@
}
}
=
+ public DAVFileAccess containsLockedFiles() {
+ if (!isCollection() && isLocked()) {
+ return this;
+ }
+ DAVFileAccess result =3D null;
+ List c =3D getChildren();
+ for (Iterator iterator =3D c.iterator(); iterator.hasNext() && res=
ult =3D=3D null;) {
+ DAVFileAccess davFileAccess =3D (DAVFileAccess) iterator.next(=
);
+ result =3D davFileAccess.containsLockedFiles();
+ }
+ return result;
+ }
+
public NodeLock getLock() {
final Monitor mon;
if (monitorLogger.isDebugEnabled()) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
