[Fmsystem-commits] [8503]

[Erik Holm-Larsen]

Revision: 8503
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8503
Author:   erikhl
Date:     2012-01-06 08:13:27 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/templates/base/procedure/procedure_item.xsl

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2012-01-05 18:22:42 UTC 
(rev 8502)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2012-01-06 08:13:27 UTC 
(rev 8503)
@@ -39,6 +39,7 @@
        {
                private $so;
                private $so_control_area;
+               private $_category_acl;
                private $so_control;
                private $so_control_group_list;
 
@@ -63,6 +64,10 @@
                        $this->so_control_group_list = 
CreateObject('controller.socontrol_group_list');
                        
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"controller::procedure";
+                       
+                       $config = CreateObject('phpgwapi.config','controller');
+                       $config->read();
+                       $this->_category_acl = 
isset($config->config_data['acl_at_control_area']) && 
$config->config_data['acl_at_control_area'] == 1 ? true : false;
                        //$this->bo = CreateObject('property.boevent',true);
                }
 
@@ -75,7 +80,24 @@
                        self::add_javascript('controller', 'yahoo', 
'datatable.js');
                        phpgwapi_yui::load_widget('datatable');
                        phpgwapi_yui::load_widget('paginator');
+                       
+                       // Sigurd: START as categories
+                       $cats   = CreateObject('phpgwapi.categories', -1, 
'controller', '.control');
+                       $cats->supress_info     = true;
 
+                       $control_areas = 
$cats->formatted_xslt_list(array('format'=>'filter','selected' => '','globals' 
=> true,'use_acl' => $this->_category_acl));
+                       array_unshift($control_areas['cat_list'],array 
('cat_id'=>'','name'=> lang('select value')));
+                       $control_areas_array2 = array();
+                       foreach($control_areas['cat_list'] as $cat_list)
+                       {
+                               $control_areas_array2[] = array
+                               (
+                                       'id'    => $cat_list['cat_id'],
+                                       'name'  => $cat_list['name'],
+                               );              
+                       }
+                       // END as categories
+
                        $data = array(
                                'form' => array(
                                        'toolbar' => array(
@@ -83,7 +105,7 @@
                                                        array('type' => 
'filter',
                                                                'name' => 
'control_areas',
                                                                'text' => 
lang('Control_area').':',
-                                                               'list' => 
$this->so_control_area->get_control_area_select_array(),
+                                                               'list' => 
$control_areas_array2,
                                                        ),
                                                        array('type' => 'text', 
                                                                'text' => 
lang('search'),
@@ -274,7 +296,24 @@
                                        $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
                                        $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
                                }
-                               $control_area_array = 
$this->so_control_area->get_control_area_array();
+                               
+                               // Sigurd: START as categories
+                               $cats   = CreateObject('phpgwapi.categories', 
-1, 'controller', '.control');
+                               $cats->supress_info     = true;
+       
+                               $control_areas = 
$cats->formatted_xslt_list(array('format'=>'filter','selected' => 
$procedure->get_control_area_id(),'globals' => true,'use_acl' => 
$this->_category_acl));
+                               array_unshift($control_areas['cat_list'],array 
('cat_id'=>'','name'=> lang('select value')));
+                               $control_areas_array2 = array();
+                               foreach($control_areas['cat_list'] as $cat_list)
+                               {
+                                       $control_areas_array2[] = array
+                                       (
+                                               'id'    => $cat_list['cat_id'],
+                                               'name'  => $cat_list['name'],
+                                       );              
+                               }
+                               // END as categories
+/*                             $control_area_array = 
$this->so_control_area->get_control_area_array();
                                foreach ($control_area_array as $control_area)
                                {
                                        if($procedure->get_control_area_id() && 
$control_area->get_id() == $procedure->get_control_area_id())
@@ -295,6 +334,7 @@
                                                );
                                        }
                                }
+*/
                                $procedure_array = $procedure->toArray();
                                //_debug_array($procedure_array);
                                
@@ -316,7 +356,8 @@
                                        'img_go_home'                   => 
'rental/templates/base/images/32x32/actions/go-home.png',
                                        'editable'                              
=> true,
                                        'procedure'                             
=> $procedure_array,
-                                       'control_area'                          
=> array('options' => $control_area_options),
+                                       //'control_area'                        
        => array('options' => $control_area_options),
+                                       'control_area'          => 
array('options' => $control_areas_array2),
                                );
 
 

Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl        
2012-01-05 18:22:42 UTC (rev 8502)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl        
2012-01-06 08:13:27 UTC (rev 8503)
@@ -38,7 +38,6 @@
                                        <xsl:choose>
                                                <xsl:when test="editable">
                                                        <select 
id="control_area" name="control_area">
-                                                               <option 
value="0">Ingen valgt</option>
                                                                
<xsl:apply-templates select="control_area/options"/>
                                                        </select>
                                                </xsl:when>