[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16914] controller: typo
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16914] controller: typo |
|
Date: |
Thu, 6 Jul 2017 07:53:08 -0400 (EDT) |
Revision: 16914
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16914
Author: sigurdne
Date: 2017-07-06 07:53:07 -0400 (Thu, 06 Jul 2017)
Log Message:
-----------
controller: typo
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_group.inc.php
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.soprocedure.inc.php
Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php 2017-07-06 11:02:55 UTC
(rev 16913)
+++ trunk/controller/inc/class.socontrol_group.inc.php 2017-07-06 11:53:07 UTC
(rev 16914)
@@ -138,7 +138,7 @@
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr',
true), 'string'));
- $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
+ $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_component_location_id($this->unmarshal($this->db->f('component_location_id'),
'int'));
@@ -343,7 +343,7 @@
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr',
true), 'string'));
- $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
+ $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_component_location_id($this->unmarshal($this->db->f('component_location_id'),
'int'));
@@ -384,7 +384,7 @@
$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',
true), 'string'));
$control_group->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')));
+ $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_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'string'));
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr',
true), 'string'));
@@ -417,7 +417,7 @@
while ($this->db->next_record())
{
$control_area =
$this->unmarshal($this->db->f('control_area_id'), 'int');
- $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id', 'int')));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$control_area_array[] = array($control_area =>
$category[0]['name']);
}
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2017-07-06 11:02:55 UTC
(rev 16913)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2017-07-06 11:53:07 UTC
(rev 16914)
@@ -145,7 +145,7 @@
$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'),
'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')));
+
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$control_item->set_control_area_name($category[0]['name']);
@@ -183,7 +183,7 @@
$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'),
'int'));
$control_item->set_control_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id')));
+
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$control_item->set_control_area_name($category[0]['name']);
Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php 2017-07-06 11:02:55 UTC
(rev 16913)
+++ trunk/controller/inc/class.soprocedure.inc.php 2017-07-06 11:53:07 UTC
(rev 16914)
@@ -166,9 +166,9 @@
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
$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')));
+
$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')));
+ $category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$procedure->set_control_area_name($category[0]['name']);
//$procedure->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
'string')));
@@ -217,8 +217,8 @@
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
$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_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[0]['name']);
}
@@ -424,7 +424,7 @@
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
$procedure->set_revision_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$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')));
+ $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']);
$results[] = $procedure->toArray();
@@ -553,9 +553,9 @@
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
$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')));
-
//$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_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[0]['name']);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16914] controller: typo,
sigurdne <=