Author: xlawrence
Date: Fri Jun 8 12:02:17 2007
New Revision: 17516
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17516&repname=
=3Djahia
Log:
Resolve issue http://www.jahia.net/jira/browse/JAHIA-1956: p2: certain fiel=
ds (page field, big text field;...) are not locked in read-only mode when a=
user (or the workflow) put a lock on the container.
The problem was only regarding the versionning engine. Everything OK with t=
he workflow.
We now display the locked page in the versionning sitemap and display a mes=
sage to 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/ajax/sitemap/SiteM=
apAbstractAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/lock/Lock=
Prerequisites.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTree.js
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/p=
ages/sitemap.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=3D17516&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 Jun 8 12:02:17 2007
@@ -771,6 +771,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.homeDir.label =3D My fold=
er
org.jahia.engines.filemanager.Filemanager_Engine.sharedDir.label =3D Share=
d folder (site)
org.jahia.engines.filemanager.Filemanager_Engine.usersDir.label =3D User f=
olders
+org.jahia.engines.filemanager.Filemanager_Engine.group.label =3D Group
org.jahia.engines.filemanager.Filemanager_Engine.groupsDir.label =3D Group=
folders
org.jahia.engines.filemanager.Filemanager_Engine.operations.label =3D Oper=
ations
org.jahia.engines.filemanager.Filemanager_Engine.addproperty.label =3D Add=
property
@@ -1168,6 +1169,7 @@
org.jahia.engines.version.level =3D Level
org.jahia.engines.version.levels =3D Levels
org.jahia.engines.version.liveVersion =3D live
+org.jahia.engines.version.lockedPages =3D Pages appearing in red are curre=
ntly locked by another user and cannot be selected
org.jahia.engines.version.mergedDifference =3D Merged difference
org.jahia.engines.version.newVersion =3D New version
org.jahia.engines.version.nbOfRevisions =3D Nb of revisions
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=3D17516&=
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 Jun 8 12:02:17 2007
@@ -771,6 +771,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.homeDir.label =3D My fold=
er
org.jahia.engines.filemanager.Filemanager_Engine.sharedDir.label =3D Share=
d folder (site)
org.jahia.engines.filemanager.Filemanager_Engine.usersDir.label =3D User f=
olders
+org.jahia.engines.filemanager.Filemanager_Engine.group.label =3D Group
org.jahia.engines.filemanager.Filemanager_Engine.groupsDir.label =3D Group=
folders
org.jahia.engines.filemanager.Filemanager_Engine.operations.label =3D Oper=
ations
org.jahia.engines.filemanager.Filemanager_Engine.addproperty.label =3D Add=
property
@@ -1168,6 +1169,7 @@
org.jahia.engines.version.level =3D Level
org.jahia.engines.version.levels =3D Levels
org.jahia.engines.version.liveVersion =3D live
+org.jahia.engines.version.lockedPages =3D Pages appearing in red are curre=
ntly locked by another user and cannot be selected
org.jahia.engines.version.mergedDifference =3D Merged difference
org.jahia.engines.version.newVersion =3D New version
org.jahia.engines.version.nbOfRevisions =3D Nb of revisions
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=3D17516&=
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 Jun 8 12:02:17 2007
@@ -311,6 +311,7 @@
org.jahia.engines.filemanager.Filemanager_Engine.general.label =3D G=C3=A9=
n=C3=A9ral
org.jahia.engines.filemanager.Filemanager_Engine.getcontentlanguage.label =
=3D Langue du contenu
org.jahia.engines.filemanager.Filemanager_Engine.getcontenttype.label =3D =
Type MIME
+org.jahia.engines.filemanager.Filemanager_Engine.group.label =3D Groupe
org.jahia.engines.filemanager.Filemanager_Engine.groupsDir.label =3D R=C3=
=A9pertoires groupes
org.jahia.engines.filemanager.Filemanager_Engine.helpGed.label =3D <ul><li=
><b>Oui : </b>la valeur appara=C3=AEtra dans le chemin correspondant e=
t que la recherche sera activ=C3=A9e.<br/> </li><li><b>Non : </b>=
la valeur n'appara=C3=AEtra pas dans le chemin correspondant et que la rech=
erche sera d=C3=A9sactiv=C3=A9e.<br/> </li><li><b>Cach=C3=A9 : </=
b>signifie que la valeur n'appara=C3=AEtra pas dans le chemin correspondant=
, mais que la recherche sera activ=C3=A9e</li></ul>
org.jahia.engines.filemanager.Filemanager_Engine.hidden.label =3D Cach=C3=
=A9
@@ -915,6 +916,7 @@
org.jahia.engines.version.level =3D Niveau
org.jahia.engines.version.levels =3D Niveaux
org.jahia.engines.version.liveVersion =3D en ligne
+org.jahia.engines.version.lockedPages =3D Les pages en rouge sont actuelle=
ment verrouill=C3=A9es par un autre utilisateur et ne peuvent =C3=AAtre s=
=C3=A9lectionn=C3=A9es
org.jahia.engines.version.newVersion =3D Nouvelle version
org.jahia.engines.version.mergedDifference =3D Difference
org.jahia.engines.version.nbOfRevisions =3D Nb de r=C3=A9visions
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap=
/SiteMapAbstractAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteMapAbstractAction.java&rev=
=3D17516&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/sitemap/SiteM=
apAbstractAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteM=
apAbstractAction.java Fri Jun 8 12:02:17 2007
@@ -44,6 +44,7 @@
import org.jahia.views.engines.JahiaEngineViewHelper;
import org.jahia.views.engines.versioning.pages.PagesVersioningViewHelper;
import org.jahia.bin.Jahia;
+import org.jahia.registries.ServicesRegistry;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
=
@@ -379,24 +380,38 @@
languageState =3D new Integer(EntryLoadReq=
uest.STAGING_WORKFLOW_STATE);
}
}
- boolean isStaging =3D languageState.intValue() > E=
ntryLoadRequest.ACTIVE_WORKFLOW_STATE;
+ final boolean isStaging =3D languageState.intValue=
() > EntryLoadRequest.ACTIVE_WORKFLOW_STATE;
+ final boolean isLocked;
+ if (jParams.settings().areLocksActivated()) {
+ final LockKey lockKey =3D LockKey.composeLockK=
ey(LockKey.WORKFLOW_ACTION + "_" +
+ ContentPageKey.PAGE_TYPE, page.getID()=
);
+ final LockService lockService =3D ServicesRegi=
stry.getInstance().getLockService();
+ isLocked =3D ! lockService.acquire(lockKey, cu=
rrentUser,
+ currentUser.getUserKey(),
+ jParams.getSessionState().getMaxInacti=
veInterval());
+ if (isLocked) {
+ item.setAttribute("locked", "locked");
+ }
+ } else {
+ isLocked =3D false;
+ }
=
final boolean allowPageSelection =3D page.checkWri=
teAccess(jParams.getUser());
final Set selectedPages =3D pagesVersViewHelper.ge=
tSelectedPages();
=
if (pagesVersViewHelper.getOperationType() =3D=3D =
1) { // Undo Staging
- if (!allowPageSelection || existOnlyInStaging =
|| !isStaging) {
+ if (isLocked || !allowPageSelection || existOn=
lyInStaging || !isStaging) {
lang.setAttribute("Disable", "Disable");
}
- if (isStaging && hasArchiveEntryBeforeRestoreD=
ate &&
+ if (! isLocked && isStaging && hasArchiveEntry=
BeforeRestoreDate &&
selectedPages.contains(page.getObjectK=
ey())) {
lang.setAttribute("checked", "checked");
}
} else if (pagesVersViewHelper.getOperationType() =
=3D=3D 2) { // Restore Archive
- if (!allowPageSelection || !hasArchiveEntryBef=
oreRestoreDate || wasDeleted) {
+ if (isLocked || !allowPageSelection || !hasArc=
hiveEntryBeforeRestoreDate || wasDeleted) {
lang.setAttribute("Disable", "Disable");
}
- if (!(!hasArchiveEntryBeforeRestoreDate || was=
Deleted) &&
+ if (!isLocked && hasArchiveEntryBeforeRestoreD=
ate && !wasDeleted &&
selectedPages.contains(page.getObjectK=
ey())) {
lang.setAttribute("checked", "checked");
}
@@ -414,6 +429,7 @@
logger.debug("Page: " + key + " is deleted");
} else {
lang.appendChild(resp.createTextNode(languageS=
tate.toString()));
+
}
} else {
lang.appendChild(resp.createTextNode("-3"));
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/loc=
k/LockPrerequisites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/lock/LockPrerequisites.java&rev=3D=
17516&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/lock/Lock=
Prerequisites.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/lock/Lock=
Prerequisites.java Fri Jun 8 12:02:17 2007
@@ -267,7 +267,6 @@
results.addReadOnlyTab(FIELD_RIGHTS);
results.addReadOnlyTab(TIME_BASED_PUBLISHING);
results.addReadOnlyTab(MANAGE_WORKFLOW);
- results.addReadOnlyTab(VERSIONNING);
results.addReadOnlyTab(LOGS);
results.addDisabledTab(VERSIONNING);
lockPrerequisitesResultMap.put(lockKey, results);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/zimbra/complexTree/ComplexTree.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTree=
.js&rev=3D17516&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/javascript/zimbr=
a/complexTree/ComplexTree.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/zimbr=
a/complexTree/ComplexTree.js Fri Jun 8 12:02:17 2007
@@ -1223,6 +1223,14 @@
result.checked =3D checked;
}
delete checked;
+
+ } else {
+ var lockedUrl =3D XmlUtils.getAttrValue(pageInfo, this._props.CURR=
ENT_XML_TAG_NAME, "locked");
+ if (lockedUrl) {
+ _keys.add("locked");
+ result.locked =3D lockedUrl;
+ }
+ delete lockedUrl;
}
=
var langs =3D XmlUtils.splitXml(pageInfo, "lang");
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versio=
ning/pages/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/versioning/pages/sitemap.jsp&rev=3D17=
516&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/views/engines/versioning/p=
ages/sitemap.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/p=
ages/sitemap.jsp Fri Jun 8 12:02:17 2007
@@ -176,7 +176,10 @@
<% } %>
<tr>
<td align=3D"left" valign=3D"top" colspan=3D"3">
- <b><jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.version.pagesSelection"/> :</b><br/>
+ <b><jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.version.pagesSelection"/> :</b>
+ <p>
+ <span class=3D"error">N.B: <jahia:engineResourceBundl=
e resourceName=3D"org.jahia.engines.version.lockedPages"/></span>
+ </p>
<%
// Restore specific
final int restoreVersionID =3D (int) (pagesVersViewHelper.=
getRestoreDateCalendar().getDateLong().longValue() / 1000);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
