Author: tdraier
Date: Wed May 23 16:44:14 2007
New Revision: 17367
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17367&repname=
=3Djahia
Log:
use lock button to invert lock state ( DOC-89 )
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/webdav/GetFil=
eManagerToolBar.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/webdav/=
GetFileManagerToolBar.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/webdav/GetFileManagerToolBar.java&rev=
=3D17367&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/GetFil=
eManagerToolBar.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/webdav/GetFil=
eManagerToolBar.java Wed May 23 16:44:14 2007
@@ -137,17 +137,17 @@
item.setAttribute(UNZIP, String.valueOf(false));
toolbarValues.put(UNZIP, Boolean.valueOf(false));
}
+ if (isDir) {
+ item.setAttribute(LOCK_FILE, String.valueOf(false));
+ toolbarValues.put(LOCK_FILE, Boolean.valueOf(false));
+ } else {
+ item.setAttribute(LOCK_FILE, String.valueOf(getValue(t=
oolbarValues, LOCK_FILE)));
+ }
if (isWriteable && !isLocked) {
item.setAttribute(MOVE, String.valueOf(getValue(toolba=
rValues, MOVE)));
final int size =3D ((Vector) toolbarValues.get(CHECKED=
_ITEMS)).size();
item.setAttribute(RENAME, String.valueOf(getValue(tool=
barValues, RENAME) && size < 2));
item.setAttribute(DELETE, String.valueOf(getValue(tool=
barValues, DELETE)));
- if (isDir) {
- item.setAttribute(LOCK_FILE, String.valueOf(false)=
);
- toolbarValues.put(LOCK_FILE, Boolean.valueOf(false=
));
- } else {
- item.setAttribute(LOCK_FILE, String.valueOf(getVal=
ue(toolbarValues, LOCK_FILE)));
- }
} else {
item.setAttribute(MOVE, String.valueOf(false));
toolbarValues.put(MOVE, Boolean.valueOf(false));
@@ -155,8 +155,6 @@
toolbarValues.put(RENAME, Boolean.valueOf(false));
item.setAttribute(DELETE, String.valueOf(false));
toolbarValues.put(DELETE, Boolean.valueOf(false));
- item.setAttribute(LOCK_FILE, String.valueOf(false));
- toolbarValues.put(LOCK_FILE, Boolean.valueOf(false));
}
=
item.setAttribute("writeable", String.valueOf(isWriteable)=
);
@@ -210,10 +208,10 @@
unzip =3D false;
}
=
+ if (isDir2) {
+ lockFile =3D false;
+ }
if (isWriteable2 && !isLocked2) {
- if (isDir2) {
- lockFile =3D false;
- }
if (vect.size() > 1) {
rename =3D false;
}
@@ -221,7 +219,6 @@
move =3D false;
rename =3D false;
delete =3D false;
- lockFile =3D false;
}
=
if (isReadable2) {} else {
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=3D17367&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 Wed May 23 16:44:14 2007
@@ -190,9 +190,12 @@
if ("fileLock".equals(davAction)) {
for (int i =3D 0; i < objectDaves.length; i++) {
final DAVFileAccess objectDav =3D objectDaves[i];
- if (objectDav.isLocked()) continue;
objectDav.beginTransaction();
- ok =3D objectDav.lockFile(jParams.getUser().isRoot());
+ if (objectDav.isLocked()) {
+ ok =3D objectDav.unlockFile(jParams.getUser().isRo=
ot());
+ } else {
+ ok =3D objectDav.lockFile(jParams.getUser().isRoot=
());
+ }
if (ok) {
objectDav.commitTransaction();
} else {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
