Author: tdraier
Date: Fri May 25 15:44:42 2007
New Revision: 17387
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17387&repname=
=3Djahia
Log:
added check before displaying lock/unlock icon, changed text ( DOC-89 )
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/ajax/webdav/GetFil=
eManagerToolBar.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=3D17387&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 May 25 15:44:42 2007
@@ -735,7 +735,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.copyProperty.label =3D Ap=
ply to all files and subdirectories
org.jahia.engines.filemanager.Filemanager_Engine.unzipFile.label =3D Unzip
org.jahia.engines.filemanager.Filemanager_Engine.editFile.label =3D Edit p=
roperties
-org.jahia.engines.filemanager.Filemanager_Engine.lockFile.label =3D Lock f=
ile
+org.jahia.engines.filemanager.Filemanager_Engine.lockFile.label =3D Lock /=
unlock file
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
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=3D17387&=
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 May 25 15:44:42 2007
@@ -735,7 +735,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.copyProperty.label =3D Ap=
ply to all files and subdirectories
org.jahia.engines.filemanager.Filemanager_Engine.unzipFile.label =3D Unzip
org.jahia.engines.filemanager.Filemanager_Engine.editFile.label =3D Edit p=
roperties
-org.jahia.engines.filemanager.Filemanager_Engine.lockFile.label =3D Lock f=
ile
+org.jahia.engines.filemanager.Filemanager_Engine.lockFile.label =3D Lock /=
unlock file
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
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=3D17387&=
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 May 25 15:44:42 2007
@@ -316,7 +316,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.isPublic.label =3D Est pu=
blic
org.jahia.engines.filemanager.Filemanager_Engine.keywords.label =3D Mots-c=
l=C3=A9s
org.jahia.engines.filemanager.Filemanager_Engine.list.label =3D Liste
-org.jahia.engines.filemanager.Filemanager_Engine.lockFile.label =3D Verrou=
iller le fichier
+org.jahia.engines.filemanager.Filemanager_Engine.lockFile.label =3D Verrou=
iller / D=C3=A9verrouiller le fichier
org.jahia.engines.filemanager.Filemanager_Engine.modified.label =3D Modifi=
=C3=A9
org.jahia.engines.filemanager.Filemanager_Engine.moreThanOne.label =3D Vou=
s avez s=C3=A9lectionn=C3=A9 plusieurs fichiers ou r=C3=A9pertoires !
org.jahia.engines.filemanager.Filemanager_Engine.moveDenied.label =3D Vous=
ne pouvez pas d=C3=A9placer ce dossier car il contient des =C3=A9l=C3=A9me=
nts qui ne peuvent =C3=AAtre d=C3=A9plac=C3=A9s
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=
=3D17387&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 Fri May 25 15:44:42 2007
@@ -96,6 +96,9 @@
final boolean isWriteable =3D df.hasPermission(DAVFileAccess.W=
RITE) && df.isWriteable() && ! excludeList.contains(path) &&
! path.endsWith("/public") && ! path.endsWith("/privat=
e");
final boolean isLocked =3D df.isLocked();
+ final boolean isUnlockable =3D isLocked && (df.getLock().getOw=
nerInfo().equals(jParams.getUser().getUsername())
+ || jParams.getUser().isAdminMember(jParams.getSiteID()));
+
final boolean isDir =3D df.isCollection();
=
final HttpSession session =3D request.getSession();
@@ -137,7 +140,7 @@
item.setAttribute(UNZIP, String.valueOf(false));
toolbarValues.put(UNZIP, Boolean.valueOf(false));
}
- if (isDir) {
+ if (isDir || (isLocked && !isUnlockable)) {
item.setAttribute(LOCK_FILE, String.valueOf(false));
toolbarValues.put(LOCK_FILE, Boolean.valueOf(false));
} else {
@@ -199,6 +202,8 @@
final boolean isWriteable2 =3D df2.hasPermission(DAVFi=
leAccess.WRITE) && df2.isWriteable() && ! excludeList.contains(path2) &&
! path2.endsWith("/public") && ! path2.endsWit=
h("/private");
final boolean isLocked2 =3D df2.isLocked();
+ final boolean isUnlockable2 =3D isLocked2 && (df2.getL=
ock().getOwnerInfo().equals(jParams.getUser().getUsername())
+ || jParams.getUser().isAdminMember(jParams.getSiteID()=
));
final boolean isDir2 =3D df2.isCollection();
=
=
@@ -208,7 +213,7 @@
unzip =3D false;
}
=
- if (isDir2) {
+ if (isDir2 || (isLocked2 && !isUnlockable2)) {
lockFile =3D false;
}
if (isWriteable2 && !isLocked2) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
