[Fmsystem-commits] [8909]

[Erik Holm-Larsen]

Revision: 8909
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8909
Author:   erikhl
Date:     2012-02-17 08:51:35 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php   2012-02-16 14:49:18 UTC 
(rev 8908)
+++ trunk/controller/inc/class.socontrol_item.inc.php   2012-02-17 08:51:35 UTC 
(rev 8909)
@@ -63,7 +63,8 @@
                                        'type',
                                        'what_to_do',
                                        'how_to_do',
-                                       'control_group_id'
+                                       'control_group_id',
+                                       'control_area_id'
                        );
 
                        $values = array(
@@ -72,7 +73,8 @@
                                $this->marshal($control_item->get_type(), 
'string'),
                                $this->marshal($control_item->get_what_to_do(), 
'string'),
                                $this->marshal($control_item->get_how_to_do(), 
'string'),
-                               
$this->marshal($control_item->get_control_group_id(), 'int')
+                               
$this->marshal($control_item->get_control_group_id(), 'int'),
+                               
$this->marshal($control_item->get_control_area_id(), 'int')
                        );
 
                        $result = $this->db->query('INSERT INTO 
controller_control_item (' . join(',', $cols) . ') VALUES (' . join(',', 
$values) . ')', __LINE__,__FILE__);
@@ -107,7 +109,8 @@
                                'type = ' . 
$this->marshal($control_item->get_type(), 'string'),
                                'what_to_do = ' . 
$this->marshal($control_item->get_what_to_do(), 'string'),
                                'how_to_do = ' . 
$this->marshal($control_item->get_how_to_do(), 'string'),
-                               'control_group_id = ' . 
$this->marshal($control_item->get_control_group_id(), 'int')
+                               'control_group_id = ' . 
$this->marshal($control_item->get_control_group_id(), 'int'),
+                               'control_area_id = ' . 
$this->marshal($control_item->get_control_area_id(), 'int')
                        );
 
                        //var_dump('UPDATE controller_control_item SET ' . 
join(',', $values) . " WHERE id=$id");
@@ -175,6 +178,7 @@
                                
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do', 
true), 'string'));
                                
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                                
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
+                               
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
 
                                $results[] = $control_item;
                        }
@@ -339,6 +343,7 @@
                                
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do', 
true), 'string'));
                                
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                                
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
+                               
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
 
                                $results[] = $control_item;
                        }

Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php   2012-02-16 14:49:18 UTC 
(rev 8908)
+++ trunk/controller/inc/class.uicontrol_item.inc.php   2012-02-17 08:51:35 UTC 
(rev 8909)
@@ -89,9 +89,6 @@
                                );              
                        }
                        // END categories
-                       self::add_javascript('controller', 'yahoo', 
'datatable.js');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('paginator');
 
                        $data = array(
                                'form' => array(
@@ -192,6 +189,10 @@
                                        )
                                ),
                        );
+                       
+                       phpgwapi_yui::load_widget('datatable');
+                       phpgwapi_yui::load_widget('paginator');
+                       self::add_javascript('controller', 'yahoo', 
'datatable.js');
 //_debug_array($data);
 
                        self::render_template_xsl('datatable', $data);
@@ -268,8 +269,8 @@
                                        
$control_item->set_type(phpgw::get_var('measurement') == 'on' ? 
'control_item_type_2' : 'control_item_type_1');
                                        $control_item->set_what_to_do( 
phpgw::get_var('what_to_do','html') );
                                        $control_item->set_how_to_do( 
phpgw::get_var('how_to_do','html') );
-                                       $control_item->set_control_group_id( 
phpgw::get_var('control_group_id') );
-                                       $control_item->set_control_area_id( 
phpgw::get_var('control_area_id') );
+                                       $control_item->set_control_group_id( 
phpgw::get_var('control_group') );
+                                       $control_item->set_control_area_id( 
phpgw::get_var('control_area') );
 
                                        //$this->so->store($control_item);