cvs commit: jahia/core/src/java/org/jahia/ajax/actionmenus GetMenuItemsAction.java

[Xavier Lawrence]

xlawrence    2005/11/24 12:06:23 CET

  Modified files:
    core/src/java/org/jahia/ajax/actionmenus 
                                             GetMenuItemsAction.java 
  Log:
  If a ContainerList is empty, disable action "update" on the list
  
  Revision  Changes    Path
  1.4       +9 -2      
jahia/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java.diff?r1=1.3&r2=1.4&f=h
  
  
  
  Index: GetMenuItemsAction.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GetMenuItemsAction.java   21 Nov 2005 17:46:05 -0000      1.3
  +++ GetMenuItemsAction.java   24 Nov 2005 11:06:23 -0000      1.4
  @@ -297,6 +297,10 @@
           }
   
           final Iterator actionURIIter = 
bean.getActionURIBeans().entrySet().iterator();
  +        final boolean isEmptyContainerList = ContainerListBean.class == 
bean.getClass() &&
  +            ((ContainerListBean)bean).getContainerIdsInList().size() == 0;
  +
  +        logger.info("isEmptyContainerList: " + isEmptyContainerList);
   
           final StringBuffer launchers = new StringBuffer();
           final StringBuffer methods = new StringBuffer();
  @@ -306,6 +310,10 @@
               final Map.Entry curEntry = (Map.Entry) actionURIIter.next();
               final ActionURIBean curActionURIBean = (ActionURIBean) 
curEntry.getValue();
   
  +            if (isEmptyContainerList && 
"update".equals(curActionURIBean.getName())) {
  +                continue;
  +            }
  +
               if (curActionURIBean.isAuthorized()) {
                   
launchers.append(curActionURIBean.getLauncherUri()).append(DELIMITER);
   
  @@ -324,8 +332,7 @@
                       }
   
                   } else {
  -                    images.append(SLASH).append(curActionURIBean.getName()).
  -                            append(GIF);
  +                    
images.append(SLASH).append(curActionURIBean.getName()).append(GIF);
                   }
   
                   images.append(DELIMITER);