cvs commit: jahia/src/java/org/jahia/engines/audit ManageLogs_Engine.java jahia/src/java/org/jahia/engines/template Template_Engine.java

[Serge Huber]

shuber      2005/03/08 13:46:37 CET

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/engines/audit ManageLogs_Engine.java 
    src/java/org/jahia/engines/template Template_Engine.java 
  Log:
  Fix for JAHIA-247 : Logs routed to browser
  - Problems should no longer arrise when exiting the "logs" tags in the 
template edit popup.
  
  Revision  Changes    Path
  1.3.4.2   +16 -3     
jahia/src/java/org/jahia/engines/audit/ManageLogs_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/audit/ManageLogs_Engine.java.diff?r1=1.3.4.1&r2=1.3.4.2&f=h
  1.13.4.2  +1 -1      
jahia/src/java/org/jahia/engines/template/Template_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/template/Template_Engine.java.diff?r1=1.13.4.1&r2=1.13.4.2&f=h
  
  
  
  Index: ManageLogs_Engine.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/engines/audit/Attic/ManageLogs_Engine.java,v
  retrieving revision 1.3.4.1
  retrieving revision 1.3.4.2
  diff -u -r1.3.4.1 -r1.3.4.2
  --- ManageLogs_Engine.java    6 Aug 2004 17:59:35 -0000       1.3.4.1
  +++ ManageLogs_Engine.java    8 Mar 2005 12:46:36 -0000       1.3.4.2
  @@ -101,14 +101,23 @@
        * @param jParams a ParamBean object
        * @param jData   a JahiaData object (not mandatory)
        */
  -    public void handleActions (ParamBean jParams, JahiaData jData)
  +    public void handleActions (ParamBean jParams, int mode, HashMap 
engineMap, JahiaData jData)
               throws JahiaException,
               JahiaSessionExpirationException {
           // initalizes the hashmap
  -        HashMap engineMap = initEngineMap (jParams);
  +        // HashMap engineMap = initEngineMap (jParams);
  +
  +        switch (mode) {
  +            case (JahiaEngine.LOAD_MODE):
  +                break;
  +            case (JahiaEngine.UPDATE_MODE):
  +                break;
  +            case (JahiaEngine.SAVE_MODE):
  +                break;
  +        }
   
           // displays the screen
  -        toolBox.displayScreen (jParams, engineMap);
  +        // toolBox.displayScreen (jParams, engineMap);
   
       }
   
  @@ -152,7 +161,11 @@
   
           engineMap.put (JahiaEngine.RENDER_TYPE_PARAM, new Integer 
(JahiaEngine.RENDERTYPE_FORWARD));
           engineMap.put (JahiaEngine.ENGINE_NAME_PARAM, ENGINE_NAME);
  +        /*
  +        We should only use sendLogs template when we actually request the
  +        logs to be sent.
           engineMap.put (JahiaEngine.ENGINE_OUTPUT_FILE_PARAM, TEMPLATE_JSP);
  +        */
           theSession.setAttribute ("jahia_session_engineMap", engineMap);
   
   
  
  
  
  Index: Template_Engine.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/engines/template/Attic/Template_Engine.java,v
  retrieving revision 1.13.4.1
  retrieving revision 1.13.4.2
  diff -u -r1.13.4.1 -r1.13.4.2
  --- Template_Engine.java      6 Aug 2004 17:59:40 -0000       1.13.4.1
  +++ Template_Engine.java      8 Mar 2005 12:46:37 -0000       1.13.4.2
  @@ -202,7 +202,7 @@
               }
           } else if (lastScreen.equals (LOGS_STR)) {
               if (engineMap.get (ADMIN_ACCESS_STR) != null) {
  -                ManageLogs_Engine.getInstance ().handleActions (jParams, 
null);
  +                ManageLogs_Engine.getInstance ().handleActions (jParams, 
mode, engineMap, null);
               } else {
                   throw new JahiaForbiddenAccessException ();
               }