cvs commit: jahia/src/java/org/jahia/engines/shared BigText_Field.java Page_Field.java

[Serge Huber]

shuber      2005/09/02 10:26:47 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/jahia/engines/shared BigText_Field.java 
                                      Page_Field.java 
  Log:
  Committed improvement JAHIA-135 by Benjamin Papez, thanks !
  
  Revision       Changes    Path
  1.36.2.4.2.1   +12 -3     
jahia/src/java/org/jahia/engines/shared/BigText_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/shared/BigText_Field.java.diff?r1=1.36.2.4&r2=1.36.2.4.2.1&f=h
  1.72.4.15.2.2  +13 -2     
jahia/src/java/org/jahia/engines/shared/Page_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/shared/Page_Field.java.diff?r1=1.72.4.15.2.1&r2=1.72.4.15.2.2&f=h
  
  
  
  Index: BigText_Field.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/engines/shared/Attic/BigText_Field.java,v
  retrieving revision 1.36.2.4
  retrieving revision 1.36.2.4.2.1
  diff -u -r1.36.2.4 -r1.36.2.4.2.1
  --- BigText_Field.java        20 Oct 2004 10:08:00 -0000      1.36.2.4
  +++ BigText_Field.java        2 Sep 2005 08:26:46 -0000       1.36.2.4.2.1
  @@ -26,6 +26,7 @@
   import org.jahia.data.FormDataManager;
   import org.jahia.data.containers.JahiaContainer;
   import org.jahia.data.fields.JahiaField;
  +import org.jahia.data.fields.JahiaFieldDefinitionProperties;
   import org.jahia.engines.EngineMessage;
   import org.jahia.engines.EngineMessages;
   import org.jahia.engines.JahiaEngine;
  @@ -368,7 +369,15 @@
           }
   
           String output = "";
  -
  +        String forward = theField.getDefinition()
  +            
.getProperty(JahiaFieldDefinitionProperties.FIELD_UPDATE_JSP_FILE_PROP);
  +        if ( forward == null ){
  +          forward = JSP_FILE;
  +          if ( !editable ){
  +            forward = JahiaEngine.NOT_EDITABLE_FIELD;
  +          }
  +        }
  +        
           initHtmlEditorsHelpers(engineMap,jParams);
   
           if ( editable ){
  @@ -404,9 +413,9 @@
               //theField.setValue( FormDataManager.getInstance().formEncode( 
fieldValue ) );
   
               theField.setValue(fieldValue);
  -            output = 
ServicesRegistry.getInstance().getJahiaFetcherService().fetchServlet( jParams, 
JSP_FILE );
  +            output = 
ServicesRegistry.getInstance().getJahiaFetcherService().fetchServlet( jParams, 
forward );
           } else {
  -            output = 
ServicesRegistry.getInstance().getJahiaFetcherService().fetchServlet( jParams, 
JahiaEngine.NOT_EDITABLE_FIELD );
  +            output = 
ServicesRegistry.getInstance().getJahiaFetcherService().fetchServlet( jParams, 
forward );
           }
           engineMap.put( "fieldForm", output );
   
  
  
  
  Index: Page_Field.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/engines/shared/Attic/Page_Field.java,v
  retrieving revision 1.72.4.15.2.1
  retrieving revision 1.72.4.15.2.2
  diff -u -r1.72.4.15.2.1 -r1.72.4.15.2.2
  --- Page_Field.java   24 May 2005 18:15:23 -0000      1.72.4.15.2.1
  +++ Page_Field.java   2 Sep 2005 08:26:46 -0000       1.72.4.15.2.2
  @@ -53,6 +53,7 @@
   import org.jahia.content.ContentFieldKey;
   import org.jahia.data.containers.JahiaContainer;
   import org.jahia.data.fields.JahiaField;
  +import org.jahia.data.fields.JahiaFieldDefinitionProperties;
   import org.jahia.engines.JahiaEngine;
   import org.jahia.engines.JahiaEngineTools;
   import org.jahia.engines.selectpage.SelectPage_Engine;
  @@ -210,6 +211,16 @@
               editable = true;
           }
           String output = "";
  +        
  +        String forward = (String)theField.getDefinition()
  +                       
.getProperty(JahiaFieldDefinitionProperties.FIELD_UPDATE_JSP_FILE_PROP);
  +        if ( forward == null ){
  +            forward = Page_Field.JSP_FILE;
  +            if ( !editable ){
  +                forward = Page_Field.READONLY_JSP;
  +            }
  +        }
  +   
           if (editable) {
               JahiaPageEngineTempBean pageBean = composePage(jParams, 
engineMap, theField);
               if (pageBean == null) {
  @@ -320,10 +331,10 @@
               selectPageURLParams.put(SelectPage_Engine.PAGE_ID, new 
Integer(pageBean.getID()));
               String selectPageURL = 
SelectPage_Engine.getInstance().renderLink(jParams, selectPageURLParams);
               engineMap.put("selectPageURL", selectPageURL);
  -            output = 
ServicesRegistry.getInstance().getJahiaFetcherService().fetchServlet( jParams, 
JSP_FILE );
  +            output = 
ServicesRegistry.getInstance().getJahiaFetcherService().fetchServlet( jParams, 
forward );
           } else {
               JahiaPageEngineTempBean pageBean = composePage(jParams, 
engineMap, theField);
  -            output = 
ServicesRegistry.getInstance().getJahiaFetcherService().fetchServlet( jParams, 
READONLY_JSP );
  +            output = 
ServicesRegistry.getInstance().getJahiaFetcherService().fetchServlet( jParams, 
forward );
           }
           engineMap.put( "fieldForm", output );
           return true;