Author: bpapez
Date: Thu Sep 20 11:11:59 2007
New Revision: 18570
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18570&repname=
=3Djahia
Log:
issue JAHIA-2176: Sp3 Coprv2: Source action menu is displayed on pages whic=
h are not linked copies (http://www.jahia.net/jira/browse/JAHIA-2176)
- change the title
- added new icon
- added checks to not display link if workflow icon is displayed
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erBean.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/FieldBe=
an.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/images/a=
ctions/source.gif
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/C=
ontainerBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/beans/ContainerBean.java&rev=3D18570&r=
epname=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/data/beans/Contain=
erBean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erBean.java Thu Sep 20 11:11:59 2007
@@ -18,6 +18,8 @@
package org.jahia.data.beans;
=
import org.apache.log4j.Logger;
+import org.jahia.ajax.usersession.userSettings;
+import org.jahia.bin.Jahia;
import org.jahia.content.ContentObject;
import org.jahia.content.JahiaObject;
import org.jahia.content.PropertiesInterface;
@@ -632,18 +634,28 @@
}
}
=
- // If the container is displayed as an absolute, add a link to=
the source page where it has beed declared
- if (theContainer.getPageID() !=3D processingContext.getPageID(=
)) {
- curURL =3D processingContext.composePageUrl(theContainer.g=
etPageID(), processingContext.getLocale().toString());
+ // If the container is displayed as an absolute reference, add=
a link to the source page where it has been declared
+ // unless the workflow icon is already displayed next to it
+ if (theContainer.getPageID() !=3D processingContext.getPageID()
+ && (!isIndependantWorkflow() || !(Jahia.getSettings()
+ .isDevelopmentMode()
+ || processingContext.getSessionState()
+ .getAttribute(userSettings.WF_VISU_ENA=
BLED) !=3D null || Jahia
+ .getSettings().isWflowDisp()))) {
+ curURL =3D processingContext.composePageUrl(theContainer
+ .getPageID(), processingContext.getLocale().toStri=
ng());
final StringBuffer url =3D new StringBuffer();
url.append("document.location.href=3D'");
url.append(curURL);
url.append("'");
- curActionURIBean =3D new ActionURIBean("source", url.toStr=
ing(), url.toString());
- if ((curActionURIBean.getUri() !=3D null) && (!"".equals(c=
urActionURIBean.getUri()))) {
- actionURIs.put(curActionURIBean.getName(), curActionUR=
IBean);
+ curActionURIBean =3D new ActionURIBean("source", url.toStr=
ing(),
+ url.toString());
+ if (curActionURIBean.getUri() !=3D null
+ && curActionURIBean.getUri().length() > 0) {
+ actionURIs
+ .put(curActionURIBean.getName(), curActionURIB=
ean);
}
- }
+ } =
=
} catch (JahiaException je) {
logger.error("Error while retrieving action URI map for contai=
ner " + getID(), je);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/C=
ontainerListBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/beans/ContainerListBean.java&rev=3D185=
70&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/data/beans/Contain=
erListBean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java Thu Sep 20 11:11:59 2007
@@ -17,6 +17,8 @@
*/
package org.jahia.data.beans;
=
+import org.jahia.ajax.usersession.userSettings;
+import org.jahia.bin.Jahia;
import org.jahia.content.ContentObject;
import org.jahia.content.ContentObjectKey;
import org.jahia.content.JahiaObject;
@@ -523,15 +525,25 @@
}
=
// If the list is displayed as an absolute, add a link to the =
source page where it has beed declared
- if (jahiaContainerList.getPageID() !=3D processingContext.getP=
ageID()) {
- curURL =3D processingContext.composePageUrl(jahiaContainer=
List.getPageID(), processingContext.getLocale().toString());
+ // unless the workflow icon is already displayed next to it
+ if (jahiaContainerList.getPageID() !=3D processingContext.getP=
ageID()
+ && (!isIndependantWorkflow() || !(Jahia.getSettings()
+ .isDevelopmentMode()
+ || processingContext.getSessionState()
+ .getAttribute(userSettings.WF_VISU_ENA=
BLED) !=3D null || Jahia
+ .getSettings().isWflowDisp()))) {
+ curURL =3D processingContext.composePageUrl(jahiaContainer=
List
+ .getPageID(), processingContext.getLocale().toStri=
ng());
final StringBuffer url =3D new StringBuffer();
url.append("document.location.href=3D'");
url.append(curURL);
url.append("'");
- curActionURIBean =3D new ActionURIBean("source", url.toStr=
ing(), url.toString());
- if ((curActionURIBean.getUri() !=3D null) && (!"".equals(c=
urActionURIBean.getUri()))) {
- actionURIs.put(curActionURIBean.getName(), curActionUR=
IBean);
+ curActionURIBean =3D new ActionURIBean("source", url.toStr=
ing(),
+ url.toString());
+ if (curActionURIBean.getUri() !=3D null
+ && curActionURIBean.getUri().length() > 0) {
+ actionURIs
+ .put(curActionURIBean.getName(), curActionURIB=
ean);
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/F=
ieldBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/beans/FieldBean.java&rev=3D18570&repna=
me=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/data/beans/FieldBe=
an.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/FieldBe=
an.java Thu Sep 20 11:11:59 2007
@@ -38,6 +38,7 @@
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.workflow.WorkflowService;
import org.jahia.utils.InsertionSortedMap;
+import org.jahia.ajax.usersession.userSettings;
import org.jahia.bin.Jahia;
=
import java.util.*;
@@ -403,15 +404,25 @@
}
=
// If the field is displayed as an absolute, add a link to the=
source page where it has beed declared
- if (theField.getPageID() !=3D processingContext.getPageID()) {
- curURL =3D processingContext.composePageUrl(theField.getPa=
geID(), processingContext.getLocale().toString());
+ // unless the workflow icon is already displayed next to it
+ if (theField.getPageID() !=3D processingContext.getPageID()
+ && (!isIndependantWorkflow() || !(Jahia.getSettings()
+ .isDevelopmentMode()
+ || processingContext.getSessionState()
+ .getAttribute(userSettings.WF_VISU_ENA=
BLED) !=3D null || Jahia
+ .getSettings().isWflowDisp()))) {
+ curURL =3D processingContext.composePageUrl(theField.getPa=
geID(),
+ processingContext.getLocale().toString());
final StringBuffer buff =3D new StringBuffer();
buff.append("document.location.href=3D'");
buff.append(curURL);
buff.append("'");
- curActionURIBean =3D new ActionURIBean("source", buff.toSt=
ring(), buff.toString());
- if ((curActionURIBean.getUri() !=3D null) && (!"".equals(c=
urActionURIBean.getUri()))) {
- actionURIs.put(curActionURIBean.getName(), curActionUR=
IBean);
+ curActionURIBean =3D new ActionURIBean("source", buff.toSt=
ring(),
+ buff.toString());
+ if (curActionURIBean.getUri() !=3D null
+ && curActionURIBean.getUri().length() > 0) {
+ actionURIs
+ .put(curActionURIBean.getName(), curActionURIB=
ean);
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLTool=
Box.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.java&rev=3D18570&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/gui/HTMLToolBox.ja=
va (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja=
va Thu Sep 20 11:11:59 2007
@@ -1299,7 +1299,7 @@
Boolean displayWorkflowStates =3D Boolean.valueOf(isDevMode); //de=
fault
Boolean displayTimeBasedPublishing =3D Boolean.valueOf(isDevMode);=
//default
Boolean aclDifferenceParam =3D Boolean.valueOf(isDevMode);
- if (!Jahia.getSettings().isDevelopmentMode()) {
+ if (!isDevMode) {
try {
displayWorkflowStates =3D Boolean.valueOf((String) therequ=
est.getSession().getAttribute(userSettings.WF_VISU_ENABLED));
if (displayWorkflowStates =3D=3D null) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/im=
ages/actions/source.gif
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/images/actions/source.gif&rev=3D1=
8570&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
Binary files - no diff available.
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
