[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17284] more on controller
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [17284] more on controller |
Date: |
Wed, 8 Nov 2017 08:36:36 -0500 (EST) |
Revision: 17284
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17284
Author: sigurdne
Date: 2017-11-08 08:36:35 -0500 (Wed, 08 Nov 2017)
Log Message:
-----------
more on controller
Modified Paths:
--------------
trunk/controller/inc/class.hook_helper.inc.php
Modified: trunk/controller/inc/class.hook_helper.inc.php
===================================================================
--- trunk/controller/inc/class.hook_helper.inc.php 2017-11-08 13:30:52 UTC
(rev 17283)
+++ trunk/controller/inc/class.hook_helper.inc.php 2017-11-08 13:36:35 UTC
(rev 17284)
@@ -987,8 +987,19 @@
if
(!isset($component_short_desc[$location_id][$component_id]))
{
-
$component_short_desc[$location_id][$component_id] =
execMethod('property.soentity.get_short_description', array(
- 'location_id' => $location_id, 'id' =>
$component_id));
+ $location_info =
$GLOBALS['phpgw']->locations->get_name($location_id);
+
+ if (substr($location_info['location'], 1, 8) ==
'location')
+ {
+ $item_arr =
createObject('property.solocation')->read_single('', array('location_id' =>
$location_id,
+ 'id' => $component_id), true);
+
$component_short_desc[$location_id][$component_id] =
execMethod('property.bolocation.get_location_name', $item_arr['location_code']);
+ }
+ else
+ {
+
$component_short_desc[$location_id][$component_id] =
execMethod('property.soentity.get_short_description', array(
+ 'location_id' => $location_id,
'id' => $component_id));
+ }
}
return
$component_short_desc[$location_id][$component_id];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17284] more on controller,
sigurdne <=