Changeset 482

Timestamp:

02/18/08 21:20:27 (11 months ago)

Author:

padams

Message:

added fix for trying to load the Dashboard report view directly insteaod of via it's controller.

Location:

trunk

Files:

• module.inc (modified) (5 diffs)
• modules/base/reportDashboard.php (modified) (1 diff)

trunk/module.inc

@@ -65 +65 @@
                 
                 // Public folder URL
-                define('OWA_PUBLIC_URL', $gallery_base_url.'/modules/owa/public/');
+                define('OWA_PUBLIC_URL', $gallery_base_url.'modules/owa/public/');
                 
                 // Gallery specific config overrides array
                 
-                $owa_config['report_wrapper'] = 'wrapper_gallery.tpl';
+                $owa_config['report_wrapper'] = 'wrapper_gallery2.tpl';
                 $owa_config['images_url'] = OWA_PUBLIC_URL.'i/';
                 $owa_config['images_absolute_url'] = $owa_config['images_url'];
@@ -86 +86 @@
                 // create owa instance
                 $owa = new owa_php($owa_config);
-$gallery->debug('hello from owa after');
+                $gallery->debug('new owa instance created');
                 
                 return $owa;
@@ -373 +373 @@
                 
                 $params = array();
-                $params['view'] = 'base.report';
-                $params['subview'] = 'base.reportDashboard'; 
+                //$params['view'] = 'base.report';
+                $params['action'] = 'base.reportDashboard'; 
                 $params['period'] = 'today';      
                 $page = $owa->handleRequest($params);
@@ -410 +410 @@
 }
 
+
+GalleryCoreApi::requireOnce('modules/core/classes/GalleryController.class');
 class owaControlController extends GalleryController {
 
@@ -447 +449 @@
         function renderImmediate($status, $error) {
         
+                global $gallery;
                 $owa = owa_factory();
                 
+                $gallery->debug('hello from owaAction');
                 owa_set_priviledges();
                 

trunk/modules/base/reportDashboard.php

@@ -57 +57 @@
                 $data = array();
                 $data['params'] = $this->params;
-                
+                                
                 switch ($this->params['period']) {