tdraier 2004/08/23 17:07:55 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/webdav JahiaWebdavBaseService.java
Log:
check "lock file on publication" parameter when moving a file
Revision Changes Path
1.30.2.2 +7 -4
jahia/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java.diff?r1=1.30.2.1&r2=1.30.2.2&f=h
Index: JahiaWebdavBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/Attic/JahiaWebdavBaseService.java,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -r1.30.2.1 -r1.30.2.2
--- JahiaWebdavBaseService.java 23 Jun 2004 14:14:42 -0000 1.30.2.1
+++ JahiaWebdavBaseService.java 23 Aug 2004 15:07:55 -0000 1.30.2.2
@@ -25,6 +25,7 @@
import org.jahia.utils.JahiaTools;
import org.jahia.content.ContentContainerListsXRefManager;
import org.jahia.content.ContentFieldXRefManager;
+import org.jahia.bin.Jahia;
import java.io.File;
import java.sql.*;
@@ -361,10 +362,12 @@
if (oldfile.isValid () && oldfile.hasRevisions ()) {
oldfile.unlockFile (true);
}
- DAVFileAccess newfile = JahiaWebdavBaseService.getInstance ().
- getDAVFileAccess (site, newVal);
- if (newfile.isValid () && newfile.hasRevisions ()) {
- newfile.lockFile (true);
+ if (Jahia.getSettings().isFileLockOnPublication()) {
+ DAVFileAccess newfile = JahiaWebdavBaseService.getInstance
().
+ getDAVFileAccess (site, newVal);
+ if (newfile.isValid () && newfile.hasRevisions ()) {
+ newfile.lockFile (true);
+ }
}
}
ContentField.removeFromCache (v.getId ());
