cvs commit: corporate_portal_templates/src/view/jsp/include left_menu.inc

[Thomas Draier]

tdraier     2006/01/06 14:11:13 CET

  Modified files:
    src/view/jsp/include left_menu.inc 
  Log:
  content picker and workflow updates
  
  Revision  Changes    Path
  1.20      +3 -2      
corporate_portal_templates/src/view/jsp/include/left_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/left_menu.inc.diff?r1=1.19&r2=1.20&f=h
  
  
  
  Index: left_menu.inc
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/left_menu.inc,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- left_menu.inc     16 Dec 2005 12:27:08 -0000      1.19
  +++ left_menu.inc     6 Jan 2006 13:11:12 -0000       1.20
  @@ -21,8 +21,9 @@
               while (linksContainerEnum.hasMoreElements()) {
                   JahiaContainer linksContainer = (JahiaContainer) 
linksContainerEnum.nextElement();
                   ContainerBean linksContainerBean = new 
ContainerBean(linksContainer,jData.params());
  -                PageBean linkBean = (PageBean) 
linksContainerBean.getField("link").getObject() ;
  -                if (linkBean != null) {
  +                FieldBean fieldBean = (FieldBean) 
linksContainerBean.getField("link");
  +                if (fieldBean != null && fieldBean.getObject() != null) {
  +                    PageBean linkBean = (PageBean) fieldBean.getObject() ;
                       int truncSize = editMode ? 30 - (currentLevel * 3) : 40 
- (currentLevel * 3);
                       String pageTitle = 
jData.gui().glueTitle(linkBean.getTitle(),truncSize);
                       logger.debug("pageTitle is " + pageTitle + " for pid " + 
linkBean.getID());