Author: bpapez
Date: Wed Sep 26 17:33:50 2007
New Revision: 18675
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18675&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2176: Source action menu is displaye=
d on pages which are not linked copies
- changed the wording
- do not display the link for containerlist-actionmenus
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java
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=3D186=
75&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 Wed Sep 26 17:33:50 2007
@@ -519,30 +519,6 @@
logger.error(e.getMessage(), e);
}
}
-
- // If the list is displayed as an absolute, add a link to the =
source page where it has beed declared
- // 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
- && curActionURIBean.getUri().length() > 0) {
- actionURIs
- .put(curActionURIBean.getName(), curActionURIB=
ean);
- }
- }
-
} catch (JahiaException je) {
logger.error("Error while retrieving action URI map for contai=
ner list " +
getID(), je);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
