[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8761]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8761] |
|
Date: |
Thu, 02 Feb 2012 11:57:10 +0000 |
Revision: 8761
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8761
Author: erikhl
Date: 2012-02-02 11:57:04 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_group.inc.php
trunk/controller/inc/class.soprocedure.inc.php
trunk/controller/inc/class.uicontrol_group.inc.php
Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php 2012-02-02 11:42:52 UTC
(rev 8760)
+++ trunk/controller/inc/class.socontrol_group.inc.php 2012-02-02 11:57:04 UTC
(rev 8761)
@@ -121,9 +121,9 @@
$joins = " {$this->left_join} fm_building_part ON
(p.building_part_id = CAST(fm_building_part.id AS INT))";
$joins .= " {$this->left_join} controller_procedure
ON (p.procedure_id = controller_procedure.id)";
- $joins .= " {$this->left_join}
controller_control_area ON (p.control_area_id = controller_control_area.id)";
+ //$joins .= " {$this->left_join}
controller_control_area ON (p.control_area_id = controller_control_area.id)";
- $sql = "SELECT p.*, fm_building_part.descr AS
building_part_descr, controller_procedure.title as procedure_title,
controller_control_area.title as control_area_name FROM
controller_control_group p {$joins} WHERE p.id = " . $id;
+ $sql = "SELECT p.*, fm_building_part.descr AS
building_part_descr, controller_procedure.title as procedure_title FROM
controller_control_group p {$joins} WHERE p.id = " . $id;
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
@@ -132,7 +132,9 @@
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title'),
'string'));
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
-
$control_group->set_control_area_name($this->unmarshal($this->db->f('control_area_name'),
'string'));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
+
$control_group->set_control_area_name($category[0]['name']);
+
//$control_group->set_control_area_name($this->unmarshal($this->db->f('control_area_name'),
'string'));
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'int'));
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr'),
'string'));
@@ -304,7 +306,7 @@
$tables = "controller_control_group";
$joins = " {$this->left_join} fm_building_part ON
(building_part_id = CAST(fm_building_part.id AS INT))";
$joins .= " {$this->left_join} controller_procedure
ON (controller_control_group.procedure_id = controller_procedure.id)";
- $joins .= " {$this->left_join}
controller_control_area ON (controller_control_group.control_area_id =
controller_control_area.id)";
+// $joins .= " {$this->left_join}
controller_control_area ON (controller_control_group.control_area_id =
controller_control_area.id)";
//$joins .= " {$this->left_join}
rental_contract_composite ON (rental_contract_composite.composite_id =
rental_composite.id)";
//$joins .= " {$this->left_join} rental_contract ON
(rental_contract.id = rental_contract_composite.contract_id)";
@@ -315,8 +317,8 @@
else
{
$cols .= "controller_control_group.id,
group_name, controller_control_group.procedure_id,
controller_control_group.control_area_id as control_area_id, ";
- $cols .= "building_part_id,
fm_building_part.descr AS building_part_descr, controller_procedure.title as
procedure_title, ";
- $cols .= "controller_control_area.title as
control_area_name ";
+ $cols .= "building_part_id,
fm_building_part.descr AS building_part_descr, controller_procedure.title as
procedure_title ";
+ //$cols .= "controller_control_area.title as
control_area_name ";
}
$dir = $ascending ? 'ASC' : 'DESC';
$order = $sort_field ? "ORDER BY
{$this->marshal($sort_field, 'field')} $dir ": '';
@@ -335,7 +337,9 @@
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title'),
'string'));
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
-
$control_group->set_control_area_name($this->unmarshal($this->db->f('control_area_name'),
'string'));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
+
$control_group->set_control_area_name($category[0]['name']);
+
//$control_group->set_control_area_name($this->unmarshal($this->db->f('control_area_name'),
'string'));
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'int'));
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr'),
'string'));
}
Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php 2012-02-02 11:42:52 UTC
(rev 8760)
+++ trunk/controller/inc/class.soprocedure.inc.php 2012-02-02 11:57:04 UTC
(rev 8761)
@@ -167,7 +167,7 @@
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
'int')));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
-
$procedure->set_control_area_name($category_name = $category[0]['name']);
+
$procedure->set_control_area_name($category[0]['name']);
//$procedure->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
'string')));
}
@@ -214,7 +214,7 @@
$procedure->set_revision_date($this->unmarshal($this->db->f('revision_date'),
'int'));
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
'int')));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
-
$procedure->set_control_area_name($category_name = $category[0]['name']);
+
$procedure->set_control_area_name($category[0]['name']);
//$procedure->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
'string')));
}
@@ -484,7 +484,7 @@
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
'int')));
//$procedure->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
'string')));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
-
$procedure->set_control_area_name($category_name = $category[0]['name']);
+
$procedure->set_control_area_name($category[0]['name']);
}
return $procedure;
Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php 2012-02-02 11:42:52 UTC
(rev 8760)
+++ trunk/controller/inc/class.uicontrol_group.inc.php 2012-02-02 11:57:04 UTC
(rev 8761)
@@ -178,6 +178,11 @@
'sortable' => false
),
array(
+ 'key' => 'control_area',
+ 'label' =>
lang('Control area'),
+ 'sortable' => false
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8761],
Erik Holm-Larsen <=