[Fmsystem-commits] [7629]

[Torstein]

Revision: 7629
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7629
Author:   vator
Date:     2011-09-16 08:59:29 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socontrol_item.inc.php
    trunk/controller/inc/class.uicommon.inc.php
    trunk/controller/setup/setup.inc.php

Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php   2011-09-16 08:39:18 UTC 
(rev 7628)
+++ trunk/controller/inc/class.socontrol_item.inc.php   2011-09-16 08:59:29 UTC 
(rev 7629)
@@ -221,7 +221,7 @@
                }
                else
                {
-                       $cols = 'id, title, required, 
controller_control_item.what_to_do_desc as what_to_do, 
controller_control_item.how_to_do_desc as how_to_do, control_group_id, 
control_area_id';
+                       $cols = 'id, title, required, 
controller_control_item.what_to_do, how_to_do, control_group_id, 
control_area_id';
                }
                
                $dir = $ascending ? 'ASC' : 'DESC';

Modified: trunk/controller/inc/class.uicommon.inc.php
===================================================================
--- trunk/controller/inc/class.uicommon.inc.php 2011-09-16 08:39:18 UTC (rev 
7628)
+++ trunk/controller/inc/class.uicommon.inc.php 2011-09-16 08:59:29 UTC (rev 
7629)
@@ -126,6 +126,7 @@
                        
self::add_stylesheet('phpgwapi/js/yahoo/treeview/assets/skins/sam/treeview.css');
                        
//self::add_stylesheet('controller/templates/base/css/base.css');
                        self::add_javascript('controller', 'yahoo', 
'common.js');
+                       self::add_javascript('controller', 'controller', 
'common.js');
                        $this->tmpl_search_path = array();
                        array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/base');
                        array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set']);

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2011-09-16 08:39:18 UTC (rev 
7628)
+++ trunk/controller/setup/setup.inc.php        2011-09-16 08:59:29 UTC (rev 
7629)
@@ -34,7 +34,6 @@
        $setup_info['controller']['tables'] = array 
        (
                'controller_control',
-               'controller_control_schedule',
                'controller_control_item_list',
                'controller_control_item',
                'controller_control_group',