cvs commit: jahia/core/src/java/org/jahia/engines/shared Page_Field.java jahia/core/src/webapp/jsp/jahia/engines/shared page_field.jsp

[Xavier Lawrence]

xlawrence    2005/12/19 11:11:59 CET

  Modified files:
    core/src/java/org/jahia/engines/shared Page_Field.java 
    core/src/webapp/jsp/jahia/engines/shared page_field.jsp 
  Log:
  Avoid NPE in case a user has no access to any template when adding a new page
  
  Revision  Changes    Path
  1.33      +2 -0      
jahia/core/src/java/org/jahia/engines/shared/Page_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/Page_Field.java.diff?r1=1.32&r2=1.33&f=h
  1.21      +7 -7      
jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp.diff?r1=1.20&r2=1.21&f=h
  
  
  
  Index: Page_Field.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/Page_Field.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Page_Field.java   3 Nov 2005 13:22:23 -0000       1.32
  +++ Page_Field.java   19 Dec 2005 10:11:58 -0000      1.33
  @@ -605,6 +605,8 @@
                           JahiaException.CACHE_ERROR, 
JahiaException.CRITICAL_SEVERITY);
   
               int movedPageID = pageBean.getPageLinkID();
  +            if (movedPageID == -1) return false;
  +
               contentPage = ContentPage.getPage(movedPageID);
   
               int oldParentFieldID = 
ServicesRegistry.getInstance().getJahiaPageService()
  
  
  
  Index: page_field.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- page_field.jsp    13 Dec 2005 09:33:01 -0000      1.20
  +++ page_field.jsp    19 Dec 2005 10:11:59 -0000      1.21
  @@ -289,14 +289,14 @@
       if (!isLinkOnly) {
           final Enumeration templateList = (Enumeration) 
engineMap.get("templateList"); %>
   <tr>
  -    <td class="t33">
  -        <% if (!templateList.hasMoreElements()) { %>
  -        <input id="directPageRadio" type="radio" name="operation" value="-1" 
disabled="disabled"
  -                
>&nbsp;The&nbsp;user&nbsp;<%=jParams.getUser().getUsername()%>&nbsp;has&nbsp;no&nbsp;templates&nbsp;access&nbsp;
  +    <% if (!templateList.hasMoreElements()) { %>
  +    <td colspan="2">
  +        
&nbsp;The&nbsp;user&nbsp;<%=jParams.getUser().getUsername()%>&nbsp;has&nbsp;no&nbsp;templates&nbsp;access&nbsp;
           Cannot create a new page or change template.
  -        <% } else {
  -            if (isNewPage) { %>
  -
  +    </td>
  +    <% } else { %>
  +    <td class="t33">
  +        <% if (isNewPage) { %>
           <!-- Create a new page -->
           <input id="directPageRadio" type="radio" name="operation" 
value="<%=Page_Field.CREATE_PAGE%>"
           <% if (Page_Field.CREATE_PAGE.equals(pageBean.getOperation())) { %> 
checked="checked"<% } %>