Author: tdraier
Date: Wed May 23 13:11:39 2007
New Revision: 17363
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17363&repname=
=3Djahia
Log:
Allow multiple file delete ( DOC-205 ), =
better error messages on delete / unzip operations ( DOC-200 )
fixed some resource bundles duplicates
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_d=
e.properties
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_e=
s.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties
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
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/filedelete.jsp
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=3D17363&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 Wed May 23 13:11:39 2007
@@ -679,6 +679,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Path
org.jahia.engines.filemanager.Filemanager_Engine.createZip.label =3D Creat=
e Zip file of selected files/directories
org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label =3D Dele=
te File
+org.jahia.engines.filemanager.Filemanager_Engine.deleteFiles.label =3D Del=
ete Files
org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label =3D Delet=
e Directory
org.jahia.engines.filemanager.Filemanager_Engine.fileList.label =3D Files&=
nbsp;List
org.jahia.engines.filemanager.Filemanager_Engine.fileLocation.label =3D Fi=
le Location
@@ -744,6 +745,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label =3D Fil=
e permissions
org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label =3D =
Directory permissions
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label =3D Are you=
sure you want to delete this file ?
+org.jahia.engines.filemanager.Filemanager_Engine.confirmMultiple.label =3D=
Are you sure you want to delete these files ?
org.jahia.engines.filemanager.Filemanager_Engine.confirmDir.label =3D Are =
you sure you want to delete this directory ?
#org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Thi=
s file is being used in active or waiting content, therefore it cannot be d=
eleted.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label =3D View =
file usages
@@ -779,6 +781,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.writePermission.label =3D=
Write access
org.jahia.engines.filemanager.Filemanager_Engine.adminPermission.label =3D=
Administrator access
org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D The =
operation failed because you don't have rights to delete the following file=
s or folders
+org.jahia.engines.filemanager.Filemanager_Engine.archiveType.label =3D Arc=
hive type not supported
org.jahia.engines.include.actionSelector.Authoring.label =3D Edit
org.jahia.engines.include.actionSelector.ContentDefinition.label =3D Conte=
nt Definition
org.jahia.engines.include.actionSelector.RightsMgmt.label =3D Rights
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_de.properties&rev=3D17363&=
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_d=
e.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d=
e.properties Wed May 23 13:11:39 2007
@@ -662,6 +662,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Pfad
org.jahia.engines.filemanager.Filemanager_Engine.createZip.label =3D Ausge=
w\u00E4hlte Dateien/Ordner zu Zip-Datei komprimieren
org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label =3D Date=
i l\u00F6schen
+org.jahia.engines.filemanager.Filemanager_Engine.deleteFiles.label =3D Dat=
eien l\u00F6schen
org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label =3D Ordne=
r l\u00F6schen
org.jahia.engines.filemanager.Filemanager_Engine.fileList.label =3D Dateil=
iste
org.jahia.engines.filemanager.Filemanager_Engine.fileLocation.label =3D Sp=
eicherort
@@ -725,8 +726,9 @@
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label =3D Dat=
eiberechtigungen
org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label =3D =
Ordnerberechtigungen
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label =3D Sind Si=
e sicher, dass Sie diese Datei l\u00F6schen wollen?
+org.jahia.engines.filemanager.Filemanager_Engine.confirmMultiple.label =3D=
Sind Sie sicher, dass Sie diesen Dateien l\u00F6schen wollen?
org.jahia.engines.filemanager.Filemanager_Engine.confirmDir.label =3D Sind=
Sie sicher, dass Sie diesen Ordner l\u00F6schen wollen?
-org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Dies=
e Datei wird in einem aktiven bzw. wartenden Content verwendet und kann des=
halb nicht gel\u00F6scht werden.
+#org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Die=
se Datei wird in einem aktiven bzw. wartenden Content verwendet und kann de=
shalb nicht gel\u00F6scht werden.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label =3D Verwe=
ndung anzeigen
org.jahia.engines.filemanager.Filemanager_Engine.usage.label =3D Diese Dat=
ei wird in den folgenden Seiten verwendet:
org.jahia.engines.filemanager.Filemanager_Engine.nousage.label =3D Diese D=
atei wird im Moment nicht verwendet.
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=3D17363&=
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 Wed May 23 13:11:39 2007
@@ -679,6 +679,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Path
org.jahia.engines.filemanager.Filemanager_Engine.createZip.label =3D Creat=
e Zip file of selected files/directories
org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label =3D Dele=
te File
+org.jahia.engines.filemanager.Filemanager_Engine.deleteFiles.label =3D Del=
ete Files
org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label =3D Delet=
e Directory
org.jahia.engines.filemanager.Filemanager_Engine.fileList.label =3D Files&=
nbsp;List
org.jahia.engines.filemanager.Filemanager_Engine.fileLocation.label =3D Fi=
le Location
@@ -744,6 +745,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label =3D Fil=
e permissions
org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label =3D =
Directory permissions
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label =3D Are you=
sure you want to delete this file ?
+org.jahia.engines.filemanager.Filemanager_Engine.confirmMultiple.label =3D=
Are you sure you want to delete these files ?
org.jahia.engines.filemanager.Filemanager_Engine.confirmDir.label =3D Are =
you sure you want to delete this directory ?
#org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Thi=
s file is being used in active or waiting content, therefore it cannot be d=
eleted.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label =3D View =
file usages
@@ -779,6 +781,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.writePermission.label =3D=
Write access
org.jahia.engines.filemanager.Filemanager_Engine.adminPermission.label =3D=
Administrator access
org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D The =
operation failed because you don't have rights to delete the following file=
s or folders
+org.jahia.engines.filemanager.Filemanager_Engine.archiveType.label =3D Arc=
hive type not supported
org.jahia.engines.include.actionSelector.Authoring.label =3D Edit
org.jahia.engines.include.actionSelector.ContentDefinition.label =3D Conte=
nt Definition
org.jahia.engines.include.actionSelector.RightsMgmt.label =3D Rights
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_es.properties&rev=3D17363&=
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=
s.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
s.properties Wed May 23 13:11:39 2007
@@ -662,6 +662,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Ruta
org.jahia.engines.filemanager.Filemanager_Engine.createZip.label =3D Crear=
archivo zip de los archivos/directorios seleccionados
org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label =3D Elim=
inar archivo
+org.jahia.engines.filemanager.Filemanager_Engine.deleteFiles.label =3D Eli=
minar archivos
org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label =3D Elimi=
nar directorio
org.jahia.engines.filemanager.Filemanager_Engine.fileList.label =3D Lista&=
nbsp; de archivos
org.jahia.engines.filemanager.Filemanager_Engine.fileLocation.label =3D Ub=
icaci\u00F3n de archivo
@@ -725,8 +726,9 @@
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label =3D Per=
misos de archivo
org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label =3D =
Permisos de directorio
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label =3D \u00BFE=
st\u00E1 seguro de que desea eliminar este archivo?
+org.jahia.engines.filemanager.Filemanager_Engine.confirmMultiple.label =3D=
\u00BFEst\u00E1 seguro de que desea eliminar estos archivos?
org.jahia.engines.filemanager.Filemanager_Engine.confirmDir.label =3D \u00=
BFEst\u00E1 seguro de que desea eliminar este directorio?
-org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Este=
archivo est\u00E1 siendo usado en contenido activo o en espera; por lo tan=
to, no puede ser eliminado.
+#org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Est=
e archivo est\u00E1 siendo usado en contenido activo o en espera; por lo ta=
nto, no puede ser eliminado.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label =3D Ver u=
sos de archivos
org.jahia.engines.filemanager.Filemanager_Engine.usage.label =3D Este arch=
ivo est\u00E1 siendo usado en las siguientes p\u00E1ginas:
org.jahia.engines.filemanager.Filemanager_Engine.nousage.label =3D Este ar=
chivo no est\u00E1 actualmente en uso.
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=3D17363&=
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 Wed May 23 13:11:39 2007
@@ -261,7 +261,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.alreadyExists.label =3D U=
n fichier portant ce nom existe d=C3=A9j=C3=A0 !
org.jahia.engines.filemanager.Filemanager_Engine.autoRename.label =3D Reno=
mmer automatiquement
org.jahia.engines.filemanager.Filemanager_Engine.by.label =3D par
-org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Ce f=
ichier est utilis=C3=A9 dans du contenu publi=C3=A9 ou en attente de public=
ation. Il ne peut donc pas =C3=AAtre supprim=C3=A9.
+#org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Ce =
fichier est utilis=C3=A9 dans du contenu publi=C3=A9 ou en attente de publi=
cation. Il ne peut donc pas =C3=AAtre supprim=C3=A9.
org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D L'op=
=C3=A9ration a =C3=A9chou=C3=A9 car vous ne disposez pas des droits requis =
de supprimer les fichiers ou r=C3=A9pertoires suivants
org.jahia.engines.filemanager.Filemanager_Engine.categories.label =3D Cat=
=C3=A9gories
org.jahia.engines.filemanager.Filemanager_Engine.categoryKey.label =3D Cl=
=C3=A9 de cat=C3=A9gorie
@@ -270,6 +270,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.chartOfAccounts.label =3D=
Plan comptable
org.jahia.engines.filemanager.Filemanager_Engine.comment.label =3D Comment=
aire
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label =3D =C3=8At=
es-vous sur de vouloir effacer ce fichier ?
+org.jahia.engines.filemanager.Filemanager_Engine.confirmMultiple.label =3D=
=C3=8Ates-vous sur de vouloir effacer ces fichiers ?
org.jahia.engines.filemanager.Filemanager_Engine.confirmDir.label =3D =C3=
=8Ates-vous sur de vouloir effacer ce dossier ?
org.jahia.engines.filemanager.Filemanager_Engine.copyFile.label =3D Copier
org.jahia.engines.filemanager.Filemanager_Engine.copyProperty.label =3D Ap=
pliquer =C3=A0 tous les fichiers et sous-r=C3=A9pertoires
@@ -280,6 +281,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.deleteDenied.label =3D Vo=
us ne pouvez pas supprimer ce dossier car il contient des =C3=A9l=C3=A9ment=
s qui ne peuvent =C3=AAtre supprim=C3=A9s
org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label =3D Suppr=
imer le r=C3=A9pertoire
org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label =3D Supp=
rimer le fichier
+org.jahia.engines.filemanager.Filemanager_Engine.deleteFiles.label =3D Sup=
primer des fichiers
org.jahia.engines.filemanager.Filemanager_Engine.department-alias-path.lab=
el =3D chemin de l'alias de la hi=C3=A9rarchie
org.jahia.engines.filemanager.Filemanager_Engine.department-alias.label =
=3D Alias de la hi=C3=A9rarchie
org.jahia.engines.filemanager.Filemanager_Engine.department-path.label =3D=
Chemin hi=C3=A9rarchie
@@ -374,6 +376,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.views.label =3D Vues
org.jahia.engines.filemanager.Filemanager_Engine.warnRights.label =3D Atte=
ntion : certains utilisateurs devraient pouvoir voir ce champ, mais ne peuv=
ent lire le fichier s=C3=A9lectionn=C3=A9.
org.jahia.engines.filemanager.Filemanager_Engine.writePermission.label =3D=
Acc=C3=A8s en =C3=A9criture
+org.jahia.engines.filemanager.Filemanager_Engine.archiveType.label =3D Typ=
e d'archive non support=C3=A9
org.jahia.engines.groupname.label =3D Nom du groupe
org.jahia.engines.groups.guest.label =3D Public
org.jahia.engines.groups.users.label =3D Utilisateurs authentifi=C3=A9s
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_it.properties&rev=3D17363&=
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_i=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_i=
t.properties Wed May 23 13:11:39 2007
@@ -726,7 +726,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label =3D =
Autorizzazioni cartella
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label =3D Elimina=
re questo file?
org.jahia.engines.filemanager.Filemanager_Engine.confirmDir.label =3D Elim=
inare questa cartella?
-org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Ques=
to file \u00E8 usato in contenuti pubblicati o in attesa di esserlo, quindi=
non pu\u00F2 essere eliminato.
+#org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Que=
sto file \u00E8 usato in contenuti pubblicati o in attesa di esserlo, quind=
i non pu\u00F2 essere eliminato.
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label =3D Mostr=
a l'uso del file
org.jahia.engines.filemanager.Filemanager_Engine.usage.label =3D Il file \=
u00E8 usato nelle pagine seguenti:
org.jahia.engines.filemanager.Filemanager_Engine.nousage.label =3D Attualm=
ente il file non \u00E8 usato.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_pt.properties&rev=3D17363&=
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_p=
t.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_p=
t.properties Wed May 23 13:11:39 2007
@@ -661,7 +661,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.moreThanOne.label =3D Foi=
selecionado mais de 1 arquivo/diret\u00F3rio!
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Caminho
org.jahia.engines.filemanager.Filemanager_Engine.createZip.label =3D Criar=
arquivo Zip dos arquivos/diret\u00F3rios selecionados
-org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label =3D Excl=
uir Arquivo
+org.jahia.engines.filemanager.Filemanager_Engine.deleteFile.label =3D Excl=
uir Arquivos
org.jahia.engines.filemanager.Filemanager_Engine.deleteDir.label =3D Exclu=
ir Diret\u00F3rio
org.jahia.engines.filemanager.Filemanager_Engine.fileList.label =3D Lista&=
nbsp;de Arquivos
org.jahia.engines.filemanager.Filemanager_Engine.fileLocation.label =3D Lo=
caliza\u00E7\u00E3o do Arquivo
@@ -726,7 +726,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.dirPermissions.label =3D =
Permiss\u00F5es do diret\u00F3rio
org.jahia.engines.filemanager.Filemanager_Engine.confirm.label =3D Deseja =
realmente excluir este arquivo?
org.jahia.engines.filemanager.Filemanager_Engine.confirmDir.label =3D Dese=
ja realmente excluir este diret\u00F3rio ?
-org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Este=
arquivo est\u00E1 sendo usado em conte\u00FAdo ativo ou em espera, portant=
o, n\u00E3o pode ser exclu\u00EDdo
+#org.jahia.engines.filemanager.Filemanager_Engine.cantdelete.label =3D Est=
e arquivo est\u00E1 sendo usado em conte\u00FAdo ativo ou em espera, portan=
to, n\u00E3o pode ser exclu\u00EDdo
org.jahia.engines.filemanager.Filemanager_Engine.fileUsage.label =3D Visua=
lizar usos do arquivo
org.jahia.engines.filemanager.Filemanager_Engine.usage.label =3D Este arqu=
ivo est\u00E1 sendo usado nas seguintes p\u00E1ginas:
org.jahia.engines.filemanager.Filemanager_Engine.nousage.label =3D Este ar=
quivo n\u00E3o est\u00E1 atualmente em uso.
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=
=3D17363&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 13:11:39 2007
@@ -141,7 +141,7 @@
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) && 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=
));
@@ -216,7 +216,6 @@
}
if (vect.size() > 1) {
rename =3D false;
- delete =3D false;
}
} else {
move =3D false;
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=3D17363&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 13:11:39 2007
@@ -211,14 +211,19 @@
}
=
} else if (actionScreen.equals("fileDelete")) {
- final List list =3D jahiaWebdavBaseService.findUsages(pathes[0=
], jParams, false);
+ final List list =3D new ArrayList();
+ for (int i =3D 0; i < pathes.length; i++) {
+ list.addAll(jahiaWebdavBaseService.findUsages(pathes[i], j=
Params, false));
+ }
engineMap.put("usages", list);
=
- final DAVFileAccess objectDav =3D jahiaWebdavBaseService.getDA=
VFileAccess(
- jParams, jParams.getSite(), jParams.getUser(), pathes[=
0]);
+ for (int i =3D 0; i < pathes.length; i++) {
+ final DAVFileAccess objectDav =3D jahiaWebdavBaseService.g=
etDAVFileAccess(
+ jParams, jParams.getSite(), jParams.getUser(), pat=
hes[i]);
=
- if (objectDav.isCollection()) {
- engineMap.put("isDir", Boolean.TRUE);
+ if (objectDav.isCollection()) {
+ engineMap.put("isDir", Boolean.TRUE);
+ }
}
=
} else if (actionScreen.equals("info")) {
@@ -437,11 +442,21 @@
}
=
} else if (lastScreen.equals("fileDelete")) {
- if (jParams.getParameter("cantdelete") =3D=3D null)
- result =3D deleteFile(objectDav);
- else
+ if (jParams.getParameter("cantdelete") =3D=3D null) {
result =3D true;
-
+ List listOfFiles =3D new ArrayList();
+ jParams.setAttribute("listOfFiles", listOfFiles);
+ for (int i =3D 0; i < pathes.length; i++) {
+ DAVFileAccess currentObjectDav =3D jahiaWebdavBase=
Service.getDAVFileAccess(
+ jParams, jParams.getSite(), jParams.getUse=
r(), TableEntry.javascriptDecode(pathes[i]));
+ if (!deleteFile(currentObjectDav)) {
+ result =3D false;
+ listOfFiles.add(currentObjectDav);
+ }
+ }
+ } else {
+ result =3D true;
+ }
} else if (lastScreen.equals("fileRename")) {
result =3D renameFile(objectDav, jParams);
=
@@ -948,16 +963,33 @@
if (filesName =3D=3D null) {
return false;
}
+
+ List listOfFiles =3D new ArrayList();
+ jParams.setAttribute("listOfFiles", listOfFiles);
+
for (Iterator iterator =3D filesName.iterator(); iterator.hasN=
ext();) {
String name =3D (String) iterator.next();
- final File f =3D fupload.getFile(name);
- try {
- if (f !=3D null && f.exists()) {
- result &=3D doUnzipContent(new FileInputStream(f),=
dav.getPath(), jParams);
- f.delete();
+ String fileName =3D decodeStrangeBrowserEncoding(fupload.g=
etFileSystemName(name));
+ String contentType =3D ((ParamBean)jParams).getContext().g=
etMimeType(fileName);
+ if ("application/zip".equals(contentType) || "application/=
java-archive".equals(contentType)) {
+ final File f =3D fupload.getFile(name);
+ try {
+ if (f !=3D null && f.exists()) {
+ result &=3D doUnzipContent(new FileInputStream=
(f), dav.getPath(), jParams);
+ f.delete();
+ }
+ } catch (Exception e) {
+ logger.debug("Cannot unzip file " + name, e);
}
- } catch (Exception e) {
- logger.debug("Cannot unzip file " + name, e);
+ } else {
+ result =3D false;
+ if (doUpload(fupload, name, (ParamBean) jParams, fileN=
ame, dav)) {
+ DAVFileAccess objectDav =3D jahiaWebdavBaseService=
.getDAVFileAccess(
+ jParams, jParams.getSite(), jParams.getUse=
r(),
+ (String) jParams.getSessionState().getAttr=
ibute(jParams.getSiteID() + "-justUploaded"));
+ listOfFiles.add(objectDav);
+ }
+ jParams.setAttribute("error", "org.jahia.engines.filem=
anager.Filemanager_Engine.archiveType.label");
}
}
} else {
@@ -1327,10 +1359,7 @@
final DAVFileAccess dav) {
final File f =3D fupload.getFile(name);
if (f !=3D null && f.exists() && f.canWrite()) {
- String contentType =3D fupload.getFileContentType(name);
- if (contentType =3D=3D null) {
- contentType =3D jParams.getContext().getMimeType(filename);
- }
+ String contentType =3D jParams.getContext().getMimeType(filena=
me);
String finalName =3D dav.uploadFile(filename, f, contentType, =
jParams.getRequest());
jParams.getRequest().getSession().setAttribute(jParams.getSite=
ID() +
"-justUploaded",
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/fi=
lemanager/filedelete.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/filedelete.jsp&rev=3D=
17363&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/filemana=
ger/filedelete.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/filedelete.jsp Wed May 23 13:11:39 2007
@@ -55,14 +55,18 @@
window.onunload =3D null;
//-->
</script>
-
-<input type=3D"hidden" name=3D"path" value=3D"<%=3Dpathes[0]%>"/>
-
-<% if (isDir) { %>
+<% for (int i =3D 0; i < pathes.length; i++) { %>
+<input type=3D"hidden" name=3D"path" value=3D"<%=3Dpathes[i]%>"/>
+<% } %>
+<% if (pathes.length > 1) { %>
+<h3 class=3D"folderDelete">
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemana=
ger.Filemanager_Engine.deleteFiles.label"/>
+</h3>
+<% } else if (isDir) { %>
=
<h3 class=3D"folderDelete">
<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemana=
ger.Filemanager_Engine.deleteDir.label"/>
-</h3>
+</h3> =
=
<% } else { %>
=
@@ -97,14 +101,11 @@
=
<div class=3D"clearing"> </div>
<br/>
-<% if (isDir) { %>
-<jahia:engineResourceBundle
- resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.D=
ir.label"/>: [<b>
-<%=3DTableEntry.javascriptDecode(pathes[0])%></b>]
-<% } else { %>
-<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.shared.File_=
Field.file.label"/>: [<b>
-<%=3DTableEntry.javascriptDecode(pathes[0])%></b>]
+<b>
+<% for (int i =3D 0; i < pathes.length; i++) { %>
+<%=3DTableEntry.javascriptDecode(pathes[i])%><br/>
<% } %>
+</b>
<br/>
=
<% boolean locked =3D false;
@@ -163,7 +164,10 @@
<% if (canWrite) { %>
<p>
<strong>
- <% if (isDir) { %>
+ <% if (pathes.length > 1) { %>
+ <jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.filemanager.Filemanager_=
Engine.confirmMultiple.label"/>
+ <% } else if (isDir) { %>
<jahia:engineResourceBundle
resourceName=3D"org.jahia.engines.filemanager.Filemanager_=
Engine.confirmDir.label"/>
<% } else { %>
@@ -175,8 +179,12 @@
<% } else { %>
<p>
<span class=3D"errorbold"><jahia:engineResourceBundle
- resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.notEnoughRights.label"/>:
- </span><%=3DTableEntry.javascriptDecode(pathes[0])%>
+ resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi=
ne.notEnoughRights.label"/>:<br/>
+ </span>
+ <% for (int i =3D 0; i < pathes.length; i++) { %>
+ <%=3DTableEntry.javascriptDecode(pathes[i])%><br/>
+ <% } %>
+
</p>
<% } %>
<% } %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
