Author: xlawrence
Date: Thu Jun 14 16:11:22 2007
New Revision: 17561
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17561&repname=
=3Djahia
Log:
Resolve issue http://www.jahia.net/jira/browse/JAHIA-2014: Sp2 - AJAX FM: i=
ntegrity error on file permissions - impossible to force a permission - onl=
y the guest user is checked.
Add a checkbox allowing to bypass the warning
better messages in order to guide the user
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/engines/filemanage=
r/DAVFilemanager_Engine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/info.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=3D17561&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 Thu Jun 14 16:11:22 2007
@@ -691,6 +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 a used file. This will g=
enerate a 403 error on
+org.jahia.engines.filemanager.Filemanager_Engine.readPermissionConfirm.lab=
el =3D Please perform your changes again and select the above chack box to =
save them
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
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=3D17561&=
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 Thu Jun 14 16:11:22 2007
@@ -691,6 +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 a used file. This will g=
enerate a 403 error on
+org.jahia.engines.filemanager.Filemanager_Engine.readPermissionConfirm.lab=
el =3D Please perform your changes again and select the above chack box to =
save them
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
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=3D17561&=
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 Thu Jun 14 16:11:22 2007
@@ -350,6 +350,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.property.label =3D Propri=
=C3=A9t=C3=A9
org.jahia.engines.filemanager.Filemanager_Engine.readPermission.label =3D =
Acc=C3=A8s en lecture
org.jahia.engines.filemanager.Filemanager_Engine.readPermissionError.label=
=3D Vous tentez de restreindre les droits de lecture d'un fichier en cours=
d'utilisation. Ceci provoquera une erreur 403 sur
+org.jahia.engines.filemanager.Filemanager_Engine.readPermissionConfirm.lab=
el =3D Veuillez svp effectuer vos modifications =C3=A0 nouveau et cocher la=
case ci-dessus pour les sauvegarder
org.jahia.engines.filemanager.Filemanager_Engine.renameDenied.label =3D Vo=
us ne pouvez pas renommer ce dossier car il contient des =C3=A9l=C3=A9ments=
qui ne peuvent =C3=AAtre renomm=C3=A9s
org.jahia.engines.filemanager.Filemanager_Engine.renameFile.label =3D Reno=
mmer
org.jahia.engines.filemanager.Filemanager_Engine.resource-id.label =3D Ide=
ntifiant
@@ -551,7 +552,6 @@
org.jahia.engines.processDisplay.op.copypaste.label =3DCopier & Coller
org.jahia.engines.processDisplay.op.import.label =3D Importer
org.jahia.engines.processDisplay.op.picked.label =3D Copie li=C3=A9e
-org.jahia.engines.processDisplay.op.picked.label=3DCopie li=C3=A9e
org.jahia.engines.processDisplay.op.picker.label=3DCopie Li=C3=A9e
org.jahia.engines.processDisplay.op.pickercopy.label=3DCopie li=C3=A9e
org.jahia.engines.processDisplay.op.production.label=3DMise en Production
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=3D17561&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 Thu Jun 14 16:11:22 2007
@@ -422,12 +422,13 @@
logger.debug("tab value is: " + tab);
if (tab.equals("rightsMgmt")) {
List futur403 =3D null;
+ final boolean ignoreWarning =3D jParams.getParameter("=
ignoreAllWarnings") !=3D null;
try {
- futur403 =3D saveAcl(objectDav, jParams);
+ futur403 =3D saveAcl(objectDav, jParams, ignoreWar=
ning);
} catch (JahiaException je) {
logger.error(je, je);
}
- result =3D (futur403 =3D=3D null || futur403.size() =
=3D=3D 0);
+ result =3D ignoreWarning || (futur403 =3D=3D null || f=
utur403.size() =3D=3D 0);
if (!result) {
if (objectDav.isCollection()) {
jParams.setAttribute("error", "org.jahia.engin=
es.filemanager.Filemanager_Engine.permissionError.label");
@@ -470,7 +471,7 @@
=
} else if (lastScreen.equals("rightsMgmt")) {
try {
- final List tmp =3D saveAcl(objectDav, jParams);
+ final List tmp =3D saveAcl(objectDav, jParams, false);
result =3D (tmp =3D=3D null || tmp.size() =3D=3D 0);
} catch (JahiaException je) {
logger.error(je, je);
@@ -1689,7 +1690,7 @@
return true;
}
=
- private List saveAcl(final DAVFileAccess dav, final ProcessingContext =
jParams) throws JahiaException {
+ private List saveAcl(final DAVFileAccess dav, final ProcessingContext =
jParams, final boolean ignoreWarning) throws JahiaException {
// Check if the inheritance has to be permanently prevent or not.
final Integer userNameWidth =3D (Integer) jParams.getSessionState(=
).getAttribute(
"userNameWidth");
@@ -1770,7 +1771,7 @@
// the FileFields' rights.
=
final List futur403 =3D areWeGoingtoGenerateA403(usage=
s, subject, jParams);
- if (futur403.size() > 0) return futur403;
+ if (!ignoreWarning && futur403.size() > 0) return futu=
r403;
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/fi=
lemanager/info.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp&rev=3D17561&=
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/info.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/info.jsp Thu Jun 14 16:11:22 2007
@@ -45,7 +45,7 @@
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%!
- private static final Logger logger =3D Logger.getLogger("jsp.jahia.eng=
ines.filemanager.info");
+ //private static final Logger logger =3D Logger.getLogger("jsp.jahia.e=
ngines.filemanager.info");
private static final List excludeList =3D new ArrayList();
=
static {
@@ -743,7 +743,7 @@
for (i =3D 0; i < index; i++) {
badName +=3D "- " + usrgrpname[i].substr(1) + "\n";
}
- alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.rights.ManageRights.alertAlreadyInAcl.label",
+ alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.rights.ManageRights.alertAlreadyInAcl.label",
jParams, jParams.getLocale()))%>" + badName);
index =3D 0;
}
@@ -760,8 +760,11 @@
if (msg !=3D null) { %>
<tr>
<td colspan=3D"2">
- <p class=3D"errorbold">
- <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
shared.BigText_Field.warning.label"/>:
+ <p>
+ <span class=3D"errorbold"><jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.shared.BigText_Field=
.warning.label"/>:</span>
+ <input type=3D"checkbox" name=3D"ignoreAllWarnings"/> <ja=
hia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.shared.BigText_Field.ign=
oreWarning.label"/>
</p>
<ul class=3D"error">
<jahia:engineResourceBundle resourceName=3D"<%=3D msg %>"/>: <=
br/> <br/>
@@ -771,17 +774,25 @@
- <%=3DContentFieldKey.FIELD_TYPE + "_" + usageEntry.getId=
()%>
<jahia:engineResourceBundle resourceName=3D"org.jahia.engi=
nes.filemanager.Filemanager_Engine.for.label"/>
- <%=3D((Object[]) futur403.get(i))[1]%>
+ <% final String name =3D ((Object[]) futur403.get(i))[1].t=
oString();
+ final int index =3D name.indexOf(":");
+ if (index > -1) { %>
+ <%=3Dname.substring(0, index)%>
+ <% } else { %>
+ <%=3Dname%>
+ <% } %>
<a href=3D"javascript:<%=3DjData.gui().html().drawUpdateFi=
eldLauncher(usageEntry.getField().getContentField())%>"><img
- border=3D"0" src=3D"<jahia:serverHttpPath />/jsp/jahia=
/engines/images/actions/action.gif"
- alt=3D"<jahia:engineResourceBundle resourceName=3D"org=
.jahia.engines.updatefiled.UpdateField_Engine.updateField.label"/>"/></a>
+ border=3D"0" src=3D"<jahia:serverHttpPath />/jsp/jahia=
/engines/images/actions/update.gif"
+ alt=3D"<jahia:engineResourceBundle resourceName=3D"org=
.jahia.engines.updatefiled.UpdateField_Engine.updateField.label"/>"
+ title=3D"<jahia:engineResourceBundle resourceName=3D"o=
rg.jahia.engines.updatefiled.UpdateField_Engine.updateField.label"/>"/></a>
</li>
<% } %>
</ul>
+ <span class=3D"error"><jahia:engineResourceBundle resourceName=3D"=
org.jahia.engines.filemanager.Filemanager_Engine.readPermissionConfirm.labe=
l"/></span>
</td>
</tr>
-
<% } %>
+
<tr>
<td valign=3D"top">
<div id=3D"aclentries">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
