Author: xlawrence
Date: Tue Jun 12 16:04:01 2007
New Revision: 17547
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17547&repname=
=3Djahia
Log:
resolve issue http://www.jahia.net/jira/browse/JAHIA-1788
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/services/webdav/DA=
VFileAccess.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.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=3D17547&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 Tue Jun 12 16:04:01 2007
@@ -678,6 +678,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.empty.label =3D Your sele=
ction is empty !
org.jahia.engines.filemanager.Filemanager_Engine.moreThanOne.label =3D You=
have selected more than 1 file/directory !
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Path
+org.jahia.engines.filemanager.Filemanager_Engine.changePermOrSelectOther.l=
abel =3D Please select another file or ask an administrator to change the p=
ermissions of this file
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
@@ -690,7 +691,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.renameDenied.label =3D Yo=
u cannot rename this folder because it contains elements that cannot be ren=
amed.
org.jahia.engines.filemanager.Filemanager_Engine.permissionError.label =3D=
You cannot change permissions on this directory.
org.jahia.engines.filemanager.Filemanager_Engine.readPermissionError.label=
=3D You are attempting to restrict read rights on at used file. This will =
generate a 403 error on
-org.jahia.engines.filemanager.Filemanager_Engine.permIntegrityError.label =
=3D This file cannot be seen by the following users in live mode
+org.jahia.engines.filemanager.Filemanager_Engine.permIntegrityError.label =
=3D This file cannot be read by the following users in live mode
org.jahia.engines.filemanager.Filemanager_Engine.fileName.label =3D File&n=
bsp;Name
org.jahia.engines.filemanager.Filemanager_Engine.dirName.label =3D Directo=
ry Name
org.jahia.engines.filemanager.Filemanager_Engine.newName.label =3D New &nb=
sp;Name
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=3D17547&=
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 Tue Jun 12 16:04:01 2007
@@ -678,6 +678,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.empty.label =3D Your sele=
ction is empty !
org.jahia.engines.filemanager.Filemanager_Engine.moreThanOne.label =3D You=
have selected more than 1 file/directory !
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Path
+org.jahia.engines.filemanager.Filemanager_Engine.changePermOrSelectOther.l=
abel =3D Please select another file or ask an administrator to change the p=
ermissions of this file
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
@@ -690,7 +691,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.renameDenied.label =3D Yo=
u cannot rename this folder because it contains elements that cannot be ren=
amed.
org.jahia.engines.filemanager.Filemanager_Engine.permissionError.label =3D=
You cannot change permissions on this directory.
org.jahia.engines.filemanager.Filemanager_Engine.readPermissionError.label=
=3D You are attempting to restrict read rights on at used file. This will =
generate a 403 error on
-org.jahia.engines.filemanager.Filemanager_Engine.permIntegrityError.label =
=3D This file cannot be seen by the following users in live mode
+org.jahia.engines.filemanager.Filemanager_Engine.permIntegrityError.label =
=3D This file cannot be read by the following users in live mode
org.jahia.engines.filemanager.Filemanager_Engine.fileName.label =3D File&n=
bsp;Name
org.jahia.engines.filemanager.Filemanager_Engine.dirName.label =3D Directo=
ry Name
org.jahia.engines.filemanager.Filemanager_Engine.newName.label =3D New &nb=
sp;Name
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=3D17547&=
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 Tue Jun 12 16:04:01 2007
@@ -267,6 +267,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.categoryKey.label =3D Cl=
=C3=A9 de cat=C3=A9gorie
org.jahia.engines.filemanager.Filemanager_Engine.categoryTree.label =3D Ar=
borescence des cat=C3=A9gories
org.jahia.engines.filemanager.Filemanager_Engine.categoryValue.label =3D V=
aleur de cat=C3=A9gorie
+org.jahia.engines.filemanager.Filemanager_Engine.changePermOrSelectOther.l=
abel =3D Veuillez s=C3=A9lectionner un autre fichier ou demander =C3=A0 un =
administrateur de changer les droits du fichier
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 ?
@@ -338,7 +339,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.overwrite.label =3D =C3=
=89craser
org.jahia.engines.filemanager.Filemanager_Engine.owner.label =3D Propri=C3=
=A9taire
org.jahia.engines.filemanager.Filemanager_Engine.path.label =3D Chemin
-org.jahia.engines.filemanager.Filemanager_Engine.permIntegrityError.label =
=3D Ce fichier ne peut pas =C3=AAtre vu par les utilisateurs suivants dans =
le mode en ligne
+org.jahia.engines.filemanager.Filemanager_Engine.permIntegrityError.label =
=3D Ce fichier ne peut pas =C3=AAtre lu par les utilisateurs suivants dans =
le mode en ligne
org.jahia.engines.filemanager.Filemanager_Engine.permissionError.label =3D=
Vous ne pouvez pas changer les permissions sur ce r=C3=A9pertoire.
org.jahia.engines.filemanager.Filemanager_Engine.permissions.label =3D Per=
missions du fichier
org.jahia.engines.filemanager.Filemanager_Engine.previewFile.label =3D Ape=
r=C3=A7u
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=
547&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 Tue Jun 12 16:04:01 2007
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.services.webdav;
+ */
+package org.jahia.services.webdav;
=
import com.jamonapi.Monitor;
import com.jamonapi.MonitorFactory;
@@ -241,7 +242,7 @@
logger.debug(e, e);
}
} catch (SlideRuntimeException re) {
- logger.debug ("Error when trying to get file at " + pa=
th + " (" + re.getMessage () + ")");
+ logger.debug("Error when trying to get file at " + pat=
h + " (" + re.getMessage() + ")");
exception =3D re;
} catch (final SlideException e) {
logger.debug("Error when trying to get file at " + pat=
h + " (" + e.getMessage() + ")");
@@ -317,7 +318,7 @@
/**
* @return Returns the Set of denied users (Read Rights) in comparison=
with the permision of the field
*/
- public Set comparePermsWithField(JahiaField theField, JahiaContainer t=
heContainer) {
+ public Set comparePermsWithField(final JahiaField theField, final Jahi=
aContainer theContainer) {
final Monitor mon;
if (monitorLogger.isDebugEnabled()) {
mon =3D MonitorFactory.start("org.jahia.services.webdav.DAVFil=
eAccess.comparePermsWithField");
@@ -325,13 +326,13 @@
mon =3D null;
}
try {
- JahiaFileField fField =3D (JahiaFileField) theField.getObject(=
);
+ final JahiaFileField fField =3D (JahiaFileField) theField.getO=
bject();
if ((fField =3D=3D null) || (fField.getRealName() =3D=3D null)=
|| (fField.getRealName().length() =3D=3D 0)) {
if (mon !=3D null) mon.stop();
return new HashSet();
}
=
- JahiaBaseACL acl;
+ final JahiaBaseACL acl;
=
// if id is not yet assigned, use the container, container lis=
t or page acl
if (theField.getID() <=3D 0) {
@@ -358,58 +359,53 @@
return new HashSet();
}
=
- Set allUsers =3D new HashSet();
+ final Set allReadUsers =3D new HashSet(); // All users having=
read rights
Vector users =3D acl.getUsernameList(null);
for (Iterator iterator =3D users.iterator(); iterator.hasNext(=
);) {
String jahiaUserKey =3D (String) iterator.next();
- JahiaUser jahiaUser =3D ServicesRegistry.getInstance()
- .getJahiaUserManagerService()
- .lookupUser(jahiaUserKey);
+ JahiaUser jahiaUser =3D ServicesRegistry.getInstance().get=
JahiaUserManagerService().lookupUser(jahiaUserKey);
if (jahiaUser !=3D null) {
SubjectNode subjectNode =3D (SubjectNode) ns.structure=
.retrieve(ns.getRootToken(),
"/users/" + jahiaUser.getUsername());
if (acl.getPermission(jahiaUser, JahiaBaseACL.READ_RIG=
HTS)) {
- allUsers.add(subjectNode);
+ allReadUsers.add(subjectNode);
}
}
}
- users =3D (acl.getGroupnameList(null));
- for (Iterator iterator =3D users.iterator(); iterator.hasNext(=
);) {
+ users =3D acl.getGroupnameList(null);
+ for (final Iterator iterator =3D users.iterator(); iterator.ha=
sNext();) {
String jahiaUserKey =3D (String) iterator.next();
- if (!jahiaUserKey.startsWith(
- JahiaGroupManagerService.ADMINISTRATORS_GROUPNAME =
+ ":")) {
- JahiaGroup jahiaGroup =3D ServicesRegistry.getInstance=
()
- .getJahiaGroupManagerService()
- .lookupGroup(jahiaUserKey);
+ if (!jahiaUserKey.startsWith(JahiaGroupManagerService.ADMI=
NISTRATORS_GROUPNAME + ":")) {
+ JahiaGroup jahiaGroup =3D ServicesRegistry.getInstance=
().getJahiaGroupManagerService().
+ lookupGroup(jahiaUserKey);
if (jahiaGroup !=3D null) {
JahiaGroupNode subjectNode =3D (JahiaGroupNode) ns=
.structure.retrieve(ns.getRootToken(),
"/groups/" + jahiaGroup.getGroupname() + "=
/members");
if (acl.getPermission(jahiaGroup, JahiaBaseACL.REA=
D_RIGHTS)) {
- allUsers.add(subjectNode);
+ allReadUsers.add(subjectNode);
}
}
}
}
- Set deniedUsers =3D new HashSet();
- Set grantedUsers =3D new HashSet();
- Map readPerms =3D getPermissions(READ);
- for (final Iterator iterator =3D allUsers.iterator(); iterator=
.hasNext();) {
+ final Set deniedUsers =3D new HashSet();
+ final Set grantedUsers =3D new HashSet();
+ final Map readPerms =3D getPermissions(READ);
+ for (final Iterator iterator =3D allReadUsers.iterator(); iter=
ator.hasNext();) {
final ObjectNode subjectNode =3D (ObjectNode) iterator.nex=
t();
for (final Iterator iterator2 =3D readPerms.keySet().itera=
tor(); iterator2.hasNext();) {
-
String permissionSubject =3D (String) iterator2.next();
int state =3D ((Integer) readPerms.get(permissionSubje=
ct)).intValue();
if (permissionSubject.startsWith("+")) {
permissionSubject =3D permissionSubject.substring(=
1);
}
- if ((permissionSubject.startsWith("/") && (subjectNode=
.getUri()
- .startsWith(permissionSubject))) ||
+ if ((permissionSubject.startsWith("/") && (subjectNode=
.getUri().startsWith(permissionSubject))) ||
(!permissionSubject.startsWith("/") && (
- ns.security.hasRole(subjectNode, permi=
ssionSubject) ||
- ((permissionSubject.equals("no=
body") || permissionSubject.equals("all")) && subjectNode.getUri()
- .equals(
- "/groups/" + J=
ahiaGroupManagerService.GUEST_GROUPNAME + "/members")) ||
- ((permissionSubject.equals("gu=
est") || permissionSubject.equals("unauthenticated")) && subjectNode.getUri=
().equals(
+ ns.security.hasRole(objectNode, permis=
sionSubject) ||
+ ((permissionSubject.equals("no=
body") ||
+ permissionSubject.equa=
ls("all")) &&
+ subjectNode.getUri().e=
quals("/groups/" + JahiaGroupManagerService.GUEST_GROUPNAME + "/members")) =
||
+ ((permissionSubject.equals("gu=
est") ||
+ permissionSubject.equa=
ls("unauthenticated")) && subjectNode.getUri().equals(
"/users/" + JahiaUserM=
anagerService.GUEST_USERNAME)) ||
((permissionSubject.equals("us=
er") || permissionSubject.equals("authenticated")) && subjectNode.getUri().=
equals(
"/groups/" + JahiaGrou=
pManagerService.USERS_GROUPNAME + "/members")) ||
@@ -425,7 +421,7 @@
}
}
}
- Set result =3D new HashSet(allUsers);
+ final Set result =3D new HashSet(allReadUsers);
result.addAll(deniedUsers);
result.removeAll(grantedUsers);
if (mon !=3D null) mon.stop();
@@ -886,7 +882,7 @@
}
}
catch (Exception e) {
- logger.error("Cannot upload : ",e);
+ logger.error("Cannot upload : ", e);
return null;
} finally {
if (mon !=3D null) mon.stop();
@@ -1071,10 +1067,9 @@
* return the path in the form http://servername:port/Jahia/webdav/sha=
red
*
* @param jParams
- * @return
*/
- public String getFullPath(ParamBean jParams){
- StringBuffer serverUrlBuffer =3D new StringBuffer(((ParamBean)jPar=
ams).getRealRequest().getScheme());
+ public String getFullPath(ParamBean jParams) {
+ StringBuffer serverUrlBuffer =3D new StringBuffer(jParams.getRealR=
equest().getScheme());
serverUrlBuffer.append("://");
serverUrlBuffer.append(jParams.getServerName());
serverUrlBuffer.append(":");
@@ -1084,17 +1079,17 @@
serverUrlBuffer.append(getPath());
return serverUrlBuffer.toString();
}
- =
- public List getFolderPath(PropertyName folderPathName){
+
+ public List getFolderPath(PropertyName folderPathName) {
List folderPaths =3D new ArrayList();
UriPath parentPath =3D this.objectNode.getPath().parent();
- while ( parentPath !=3D null ){
+ while (parentPath !=3D null) {
DAVFileAccess davFileAccess =3D
- new DAVFileAccess(jParams,site,slideToken,parentPath.toString(=
));
- if ( davFileAccess.getException() =3D=3D null ) {
+ new DAVFileAccess(jParams, site, slideToken, parentPat=
h.toString());
+ if (davFileAccess.getException() =3D=3D null) {
NodeProperty prop =3D davFileAccess.getRevisionDescriptor(=
).getProperty(folderPathName);
- if ( prop !=3D null && PropertyDefinition.FOLDER_PATH_YES.=
equalsIgnoreCase(prop.getValue().toString()) ){
- folderPaths.add(0,davFileAccess);
+ if (prop !=3D null && PropertyDefinition.FOLDER_PATH_YES.e=
qualsIgnoreCase(prop.getValue().toString())) {
+ folderPaths.add(0, davFileAccess);
}
}
parentPath =3D parentPath.parent();
@@ -1167,8 +1162,6 @@
=
/**
*
- * @param folderPath , if not null , the folder are built based of fol=
der path metadata
- * @return
*/
public List getChildren(PropertyName folderPathProperty) {
final Monitor mon;
@@ -1189,47 +1182,49 @@
String s =3D (String) en.nextElement();
DAVFileAccess child =3D new DAVFileAccess(jParams, site, slide=
Token, s);
if (child.getException() =3D=3D null) {
- if ( folderPathProperty =3D=3D null ){
+ if (folderPathProperty =3D=3D null) {
list.add(child);
} else {
NodeProperty prop =3D child.getRevisionDescriptor().ge=
tProperty(folderPathProperty);
- if ( prop !=3D null && PropertyDefinition.FOLDER_PATH_=
YES.equalsIgnoreCase(prop.getValue().toString()) ){
+ if (prop !=3D null && PropertyDefinition.FOLDER_PATH_Y=
ES.equalsIgnoreCase(prop.getValue().toString()))
+ {
list.add(child);
} else {
list.addAll(child.getChildren(folderPathProperty));
}
}
- } else if ( folderPathProperty !=3D null ){
- Uri uri =3D this.ns.token.getUri(slideToken,s);
- list.addAll(getChildren(uri,folderPathProperty));
+ } else if (folderPathProperty !=3D null) {
+ Uri uri =3D this.ns.token.getUri(slideToken, s);
+ list.addAll(getChildren(uri, folderPathProperty));
}
}
if (mon !=3D null) mon.stop();
return list;
}
=
- private List getChildren(Uri uri, PropertyName folderPathProperty){
+ private List getChildren(Uri uri, PropertyName folderPathProperty) {
ArrayList list =3D new ArrayList();
- if ( uri !=3D null ){
+ if (uri !=3D null) {
try {
ObjectNode objNode =3D uri.getStore().retrieveObject(uri);
Enumeration children =3D objNode.getChildren().elements();
- while ( children.hasMoreElements() ){
- Uri childUri =3D uri.getNamespace().getUri(uri.getToke=
n(), (String)children.nextElement());
+ while (children.hasMoreElements()) {
+ Uri childUri =3D uri.getNamespace().getUri(uri.getToke=
n(), (String) children.nextElement());
DAVFileAccess childFileAccess =3D
- new DAVFileAccess(jParams,site,slideToken,chil=
dUri.toString());
- if ( childFileAccess.getException() =3D=3D null ) {
+ new DAVFileAccess(jParams, site, slideToken, c=
hildUri.toString());
+ if (childFileAccess.getException() =3D=3D null) {
NodeProperty prop =3D childFileAccess.getRevisionD=
escriptor().getProperty(folderPathProperty);
- if ( prop !=3D null && PropertyDefinition.FOLDER_P=
ATH_YES.equalsIgnoreCase(prop.getValue().toString()) ){
+ if (prop !=3D null && PropertyDefinition.FOLDER_PA=
TH_YES.equalsIgnoreCase(prop.getValue().toString()))
+ {
list.add(childFileAccess);
} else {
list.addAll(childFileAccess.getChildren(folder=
PathProperty));
}
} else {
- list.addAll(getChildren(childUri,folderPathPropert=
y));
+ list.addAll(getChildren(childUri, folderPathProper=
ty));
}
}
- } catch ( Throwable t ){
+ } catch (Throwable t) {
}
}
return list;
@@ -1703,7 +1698,7 @@
}
=
public void saveRevisionDescriptor() {
- final Monitor mon;
+ final Monitor mon;
if (monitorLogger.isDebugEnabled()) {
mon =3D MonitorFactory.start("org.jahia.services.webdav.DAVFil=
eAccess.saveProperties");
} else {
@@ -1763,7 +1758,7 @@
revisionDescriptor.setProperty(new NodeProperty(name, value, names=
pace, "", prot));
try {
Uri objectUri =3D ns.token.getUri(slideToken, getPath());
- objectUri.getStore().storeRevisionDescriptor (objectUri, revis=
ionDescriptor);
+ objectUri.getStore().storeRevisionDescriptor(objectUri, revisi=
onDescriptor);
} catch (SlideException e) {
logger.error("Cannot set property", e);
}
@@ -1788,7 +1783,7 @@
slideToken.setForceStoreEnlistment(true);
=
revisionDescriptor.setProperty(new NodeProperty(name, value, names=
pace, "", prot));
- updatedProps.add(namespace+name);
+ updatedProps.add(namespace + name);
/* FIXME : why store here when we want to store all changes once s=
aveRevisionDescriptor is called ?
try {
final Uri objectUri =3D ns.token.getUri(slideToken, getPath());
@@ -2090,61 +2085,60 @@
=
/**
* Update the search index.
- *
*/
public void updateSearchIndex() throws Exception {
JahiaLuceneContentIndexer contentIndexer =3D JahiaDomain.getInstan=
ce().getContentIndexer();
JahiaLucenePropertiesIndexer propertiesIndexer =3D JahiaDomain.get=
Instance().getPropertiesIndexer();
- if ( contentIndexer =3D=3D null && propertiesIndexer =3D=3D null ){
+ if (contentIndexer =3D=3D null && propertiesIndexer =3D=3D null) {
return;
}
Index.IndexJob addJob =3D null;
Index.IndexJob removeJob =3D null;
InputStream content =3D new ByteArrayInputStream(new byte[]{});
- if ( !this.isCollection() ){
- if ( contentIndexer !=3D null ){
+ if (!this.isCollection()) {
+ if (contentIndexer !=3D null) {
NodeRevisionContent revisionContent =3D
- this.ns.token.getContentHelper().retrieve(this.sli=
deToken,this.objectNode.getUri(),
- this.revisionDescriptor);
+ this.ns.token.getContentHelper().retrieve(this.sli=
deToken, this.objectNode.getUri(),
+ this.revisionDescriptor);
content =3D new ByteArrayInputStream(revisionContent.getCo=
ntentBytes());
}
addJob =3D contentIndexer.getIndexer()
- .createIndexJob(this.ns.token.getUri(this.slideToken,t=
his.objectNode.getUuri()),
- this.revisionDescriptor,content);
+ .createIndexJob(this.ns.token.getUri(this.slideToken, =
this.objectNode.getUuri()),
+ this.revisionDescriptor, content);
=
removeJob =3D contentIndexer.getIndexer()
- .createDeleteJob(this.ns.token.getUri(this.slideToken,this=
.objectNode.getUuri()),
- this.revisionDescriptor.getRevisionNumber());
+ .createDeleteJob(this.ns.token.getUri(this.slideToken,=
this.objectNode.getUuri()),
+ this.revisionDescriptor.getRevisionNumber());
}
Set removeJobs =3D new HashSet();
Set addJobs =3D new HashSet();
- if ( removeJob !=3D null ){
+ if (removeJob !=3D null) {
removeJobs.add(removeJob);
}
- if ( addJob !=3D null ){
+ if (addJob !=3D null) {
addJobs.add(addJob);
}
- if ( !this.isCollection() ){
- if ( contentIndexer !=3D null ){
- contentIndexer.getIndexer().scheduleIndexTransaction(remov=
eJobs,addJobs);
+ if (!this.isCollection()) {
+ if (contentIndexer !=3D null) {
+ contentIndexer.getIndexer().scheduleIndexTransaction(remov=
eJobs, addJobs);
}
}
Index.IndexJob propAddJob =3D propertiesIndexer.getIndexer()
- .createIndexJob(this.ns.token.getUri(this.slideToken,this.=
objectNode.getUuri()),
+ .createIndexJob(this.ns.token.getUri(this.slideToken, this=
.objectNode.getUuri()),
this.revisionDescriptor);
Set propAddJobs =3D new HashSet();
- if ( propAddJob !=3D null ){
+ if (propAddJob !=3D null) {
propAddJobs.add(propAddJob);
}
Set propRemoveJobs =3D new HashSet();
Index.IndexJob propRemoveJob =3D propertiesIndexer.getIndexer()
- .createDeleteJob(this.ns.token.getUri(this.slideToken,this=
.objectNode.getUuri()),
+ .createDeleteJob(this.ns.token.getUri(this.slideToken, thi=
s.objectNode.getUuri()),
this.revisionDescriptor.getRevisionNumber());
- if ( propRemoveJob !=3D null ){
+ if (propRemoveJob !=3D null) {
propRemoveJobs.add(propRemoveJob);
}
- if ( propertiesIndexer !=3D null ){
- propertiesIndexer.getIndexer().scheduleIndexTransaction(remove=
Jobs,addJobs);
+ if (propertiesIndexer !=3D null) {
+ propertiesIndexer.getIndexer().scheduleIndexTransaction(remove=
Jobs, addJobs);
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/embedded_filemanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp&r=
ev=3D17547&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/shared/e=
mbedded_filemanager.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.jsp Tue Jun 12 16:04:01 2007
@@ -539,10 +539,17 @@
<%
final Iterator ite =3D deniedUsers.iterator();
while (ite.hasNext()) {
- %> <li><%=3Dite.next()%></li> <%
+ final String name =3D ite.next().toString();
+ if (name.startsWith("/groups/")) { %>
+ <li><jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.users.SelectUG_Engin=
e.members.label"/> "<%=3Dname.substring(8, name.lastIndexOf("/"))=
%>"</li>
+ <% } else { %>
+ <li><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.work=
flow.WorkflowEngine.theUser.label"/> "<%=3Dname.substring(name.la=
stIndexOf("/") + 1)%>"</li>
+ <% }
}
-%>
+ %>
</ul>
+<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanager.=
Filemanager_Engine.changePermOrSelectOther.label"/>
</span>
<% } %>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
