[Fmsystem-commits] [7655]

[Torstein]

Revision: 7655
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7655
Author:   vator
Date:     2011-09-20 05:47:12 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.menu.inc.php
    trunk/controller/inc/class.socommon.inc.php
    trunk/controller/inc/class.socontrol_area.inc.php
    trunk/controller/inc/class.socontrol_group.inc.php
    trunk/controller/inc/class.socontrol_item.inc.php

Modified: trunk/controller/inc/class.menu.inc.php
===================================================================
--- trunk/controller/inc/class.menu.inc.php     2011-09-20 05:46:47 UTC (rev 
7654)
+++ trunk/controller/inc/class.menu.inc.php     2011-09-20 05:47:12 UTC (rev 
7655)
@@ -27,38 +27,24 @@
                                        'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicontrol.index') ),
                            'image'     => array('property', 'location_1'),
                                ),
-                               'control_item' => array
+                               'control_item2' => array
                                (
                                        'text'  => lang('Control_item'),
                                        'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicontrol_item.index') ),
                            'image'     => array('property', 'location_1'),
                                        'children'      => array(
-                                                               
'control_item_list' => array
-                                                               (
-                                                                       'text'  
=> lang('control_item_list'),
-                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item.display_control_items', 'appname' => 'controller') ),
-                                                                       'image' 
=> array('rental', 'x-office-spreadsheet')
-                                                               )
-                                                       )
-                               ),
-                               'control_item2' => array
-                               (
-                                       'text'  => lang('Control_item') . 2,
-                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicontrol_item2.index') ),
-                           'image'     => array('property', 'location_1'),
-                                       'children'      => array(
                                                                
'control_item_list2' => array
 
                                                                (
                                                                        'text'  
=> lang('control_item_list') . 2,
-                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item2.display_control_items', 'appname' => 'controller') 
),
+                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item.display_control_items', 'appname' => 'controller') ),
                                                                        'image' 
=> array('rental', 'x-office-spreadsheet')
                                                                ),
                                                                'separate_tabs' 
=> array
 
                                                                (
                                                                        'text'  
=> 'example::separate_tabs',
-                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item2.separate_tabs') ),
+                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item.separate_tabs') ),
                                                                        'image' 
=> array('rental', 'x-office-spreadsheet')
                                                                ),
                                                                

Modified: trunk/controller/inc/class.socommon.inc.php
===================================================================
--- trunk/controller/inc/class.socommon.inc.php 2011-09-20 05:46:47 UTC (rev 
7654)
+++ trunk/controller/inc/class.socommon.inc.php 2011-09-20 05:47:12 UTC (rev 
7655)
@@ -182,14 +182,15 @@
                $db2 = clone($this->db);
 
                $sql = $this->get_query($sort_field, $ascending, $search_for, 
$search_type, $filters, false);
+               
                $sql_parts = explode('1=1',$sql); // Split the query to insert 
extra condition on test for break
                $this->db->query($sql,__LINE__, __FILE__, false, true);
-
+               
                while ($this->db->next_record()) // Runs through all of the 
results
                {
                        $should_populate_object = false; // Default value - we 
won't populate object    
                        $result_id = 
$this->unmarshal($this->db->f($id_field_name), 'int'); // The id of object
-                       
+
                        if(in_array($result_id, $added_object_ids)) // Object 
with this id already added
                        {
                                $should_populate_object = true; // We should 
populate this object as we already have it in our result array

Modified: trunk/controller/inc/class.socontrol_area.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_area.inc.php   2011-09-20 05:46:47 UTC 
(rev 7654)
+++ trunk/controller/inc/class.socontrol_area.inc.php   2011-09-20 05:47:12 UTC 
(rev 7655)
@@ -119,6 +119,19 @@
                return $results;
        }       
        
+       function get_control_area_select_array()
+       {
+            $results = array();
+                       $results[] = array('id' =>  0,'name' => lang('Not 
selected'));
+                       $this->db->query("SELECT id, title as name FROM 
controller_control_area ORDER BY name ASC", __LINE__, __FILE__);
+                       while ($this->db->next_record())
+                       {
+                               $results[] = array('id' => $this->db->f('id', 
false),
+                                                          'name' => 
$this->db->f('name', false));
+                       }
+                       return $results;
+       }
+       
        function get_id_field_name($extended_info = false)
        {
                /*

Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php  2011-09-20 05:46:47 UTC 
(rev 7654)
+++ trunk/controller/inc/class.socontrol_group.inc.php  2011-09-20 05:47:12 UTC 
(rev 7655)
@@ -117,8 +117,21 @@
                }
                
                return $results;
-       }       
+       }
        
+       function get_control_group_select_array()
+       {
+            $results = array();
+                       $results[] = array('id' =>  0,'name' => lang('Not 
selected'));
+                       $this->db->query("SELECT id, group_name as name FROM 
controller_control_group ORDER BY name ASC", __LINE__, __FILE__);
+                       while ($this->db->next_record())
+                       {
+                               $results[] = array('id' => $this->db->f('id', 
false),
+                                                          'name' => 
$this->db->f('name', false));
+                       }
+                       return $results;
+       }
+       
        function get_id_field_name($extended_info = false)
        {
                /*

Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php   2011-09-20 05:46:47 UTC 
(rev 7654)
+++ trunk/controller/inc/class.socontrol_item.inc.php   2011-09-20 05:47:12 UTC 
(rev 7655)
@@ -221,7 +221,7 @@
                }
                else
                {
-                       $cols = 'id, title, required, 
controller_control_item.what_to_do, how_to_do, control_group_id, 
control_area_id';
+                       $cols = 'id, title, required, what_to_do, how_to_do, 
control_group_id, control_area_id';
                }
                
                $dir = $ascending ? 'ASC' : 'DESC';