Author: xlawrence
Date: Wed May 16 15:42:19 2007
New Revision: 17323
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17323&repname=
=3Djahia
Log:
resolve issue http://www.jahia.net/jira/browse/JAHIA-1939
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etMenuItemsAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/containerl=
istproperties/ContainerListProperties_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionm=
enus/GetMenuItemsAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java&re=
v=3D17323&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/actionmenus/G=
etMenuItemsAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/actionmenus/G=
etMenuItemsAction.java Wed May 16 15:42:19 2007
@@ -287,11 +287,6 @@
}
=
final Iterator actionURIIter =3D bean.getActionURIBeans().entrySet=
().iterator();
- final boolean isEmptyContainerList =3D ContainerListBean.class =3D=
=3D bean.getClass() &&
- ((ContainerListBean) bean).getContainerIdsInList(null).siz=
e() =3D=3D 0;
-
- logger.debug("isEmptyContainerList: " + isEmptyContainerList);
-
final StringBuffer launchers =3D new StringBuffer();
final StringBuffer methods =3D new StringBuffer();
final StringBuffer images =3D new StringBuffer();
@@ -300,10 +295,6 @@
final Map.Entry curEntry =3D (Map.Entry) actionURIIter.next();
final ActionURIBean curActionURIBean =3D (ActionURIBean) curEn=
try.getValue();
=
- if (isEmptyContainerList && "update".equals(curActionURIBean.g=
etName())) {
- continue;
- }
-
final JahiaACLManagerService aclService =3D ServicesRegistry.g=
etInstance().getJahiaACLManagerService();
=
// Check if we can edit the container in the given language
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/cont=
ainerlistproperties/ContainerListProperties_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/containerlistproperties/ContainerLi=
stProperties_Engine.java&rev=3D17323&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/containerl=
istproperties/ContainerListProperties_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/containerl=
istproperties/ContainerListProperties_Engine.java Wed May 16 15:42:19 2007
@@ -643,10 +643,8 @@
// the content cache for all the users and browsers as well as all
// pages that display this containerList...
if (theContainerList !=3D null) {
- Set containerPageRefs =3D ContentContainerListsXRefManager.
- getInstance ().
- getAbsoluteContainerListPageIDs (
- theContainerList.getID ());
+ Set containerPageRefs =3D ContentContainerListsXRefManager.get=
Instance ().
+ getAbsoluteContainerListPageIDs (theContainerList.getI=
D ());
if (containerPageRefs !=3D null) {
Iterator pageRefIDs =3D containerPageRefs.iterator ();
while (pageRefIDs.hasNext ()) {
@@ -664,7 +662,7 @@
// since we updated properties on this container list, let's flush
// the cache for the page this container list is on...
if (htmlCache !=3D null)
- htmlCache.invalidatePageEntries (Integer.toString (jParams.get=
PageID ()),EntryLoadRequest.STAGING_WORKFLOW_STATE);
+ htmlCache.invalidatePageEntries (Integer.toString (jParams.get=
PageID ()), EntryLoadRequest.STAGING_WORKFLOW_STATE);
}
=
/**
@@ -702,8 +700,7 @@
boolean startNewSession =3D false;
if (theScreen !=3D null) {
// if no, load the container value from the session
- engineMap =3D (HashMap) theSession.getAttribute (
- "jahia_session_engineMap");
+ engineMap =3D (HashMap) theSession.getAttribute ("jahia_sessio=
n_engineMap");
=
//////////////////////////////////////////////////////////////=
/////////////////////////
// FIXME -Fulco-
@@ -719,8 +716,7 @@
if ( "versioning".equals(previousScreen) ){
startNewSession =3D true;
} else {
- theContainerList =3D (JahiaContainerList) engineMap.get (
- "theContainerList");
+ theContainerList =3D (JahiaContainerList) engineMap.get ("=
theContainerList");
}
} else {
startNewSession =3D true;
@@ -794,26 +790,27 @@
} else {
engineMap.put ("jspSource", TEMPLATE_JSP);
}
- engineMap.put ("doAddEditViewRight", Boolean.TRUE);
=
if (theContainerList.getID () !=3D 0) {
engineMap.put ("enableCategories", Boolean.TRUE);
}
=
- // sets engineMap for JSPs
- jParams.setAttribute ("engineTitle",
- "Container List Settings");
- jParams.setAttribute ("org.jahia.engines.EngineHashMap",
- engineMap);
+ if (theContainerList.size() > 0) {
+ engineMap.put ("doAddEditViewRight", Boolean.TRUE);
+ }
=
+ // sets engineMap for JSPs
+ jParams.setAttribute ("engineTitle", "Container List Settings");
+ jParams.setAttribute ("org.jahia.engines.EngineHashMap", engineMap=
);
return engineMap;
}
=
- private JahiaContainerList fillEngineMap(int cListID, ProcessingContex=
t jParams, HashMap engineMap, String cursorField) throws JahiaException {
- JahiaContainerList theContainerList;
- theContainerList =3D ServicesRegistry.getInstance().
- getJahiaContainersService().loadContainerList(
- cListID, LoadFlags.NOTHING, jParams);
+ private JahiaContainerList fillEngineMap(int cListID,
+ ProcessingContext jParams,
+ HashMap engineMap,
+ String cursorField) throws Ja=
hiaException {
+ JahiaContainerList theContainerList =3D ServicesRegistry.getInstan=
ce().getJahiaContainersService().
+ loadContainerList(cListID, LoadFlags.NOTHING, jParams);
engineMap.put("theContainerList", theContainerList);
=
// print out container list properties
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
