[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8760] added display of control area name
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [8760] added display of control area name |
Date: |
Thu, 02 Feb 2012 11:42:56 +0000 |
Revision: 8760
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8760
Author: erikhl
Date: 2012-02-02 11:42:52 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
added display of control area name
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/controller/inc/model/class.control_item.inc.php
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2012-02-02 11:35:47 UTC
(rev 8759)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2012-02-02 11:42:52 UTC
(rev 8760)
@@ -134,6 +134,9 @@
$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_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
+
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id')));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', true), 'int'));
+
$control_item->set_control_area_name($category[0]['name']);
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
return $control_item;
@@ -285,6 +288,8 @@
$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'));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', true), 'int'));
+
$control_item->set_control_area_name($category[0]['name']);
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
}
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2012-02-02 11:35:47 UTC
(rev 8759)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2012-02-02 11:42:52 UTC
(rev 8760)
@@ -490,7 +490,10 @@
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
}
-
+
+ $category =
execMethod('phpgwapi.categories.return_single',
$control_item->get_control_area_id());
+
$control_item->set_control_area_name($category[0]['name']);
+
$control_item_array = $control_item->toArray();
$data = array
Modified: trunk/controller/inc/model/class.control_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_item.inc.php 2012-02-02
11:35:47 UTC (rev 8759)
+++ trunk/controller/inc/model/class.control_item.inc.php 2012-02-02
11:42:52 UTC (rev 8760)
@@ -40,7 +40,9 @@
protected $what_to_do;
protected $how_to_do;
protected $control_group_id;
+ protected $control_group_name;
protected $control_area_id;
+ protected $control_area_name;
protected $type;
/**
@@ -110,6 +112,13 @@
public function get_control_area_id() { return
$this->control_area_id; }
+ public function set_control_area_name($control_area_name)
+ {
+ $this->control_area_name = $control_area_name;
+ }
+
+ public function get_control_area_name() { return
$this->control_area_name; }
+
public function set_type($type)
{
$this->type = $type;
@@ -141,7 +150,7 @@
$result['what_to_do'] = $this->get_what_to_do();
$result['how_to_do'] = $this->get_how_to_do();
$result['control_group'] =
$this->get_control_group_name();
- $result['control_area'] = $this->get_control_area_id();
+ $result['control_area'] =
$this->get_control_area_name();
return $result;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8760] added display of control area name,
Erik Holm-Larsen <=