[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11183] bkbooking: stavanger bugfix
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [11183] bkbooking: stavanger bugfix |
Date: |
Mon, 17 Jun 2013 11:23:18 +0000 |
Revision: 11183
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11183
Author: kjell
Date: 2013-06-17 11:23:17 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
bkbooking: stavanger bugfix
Modified Paths:
--------------
branches/stavangerkommune/bookingfrontend/inc/class.bosearch.inc.php
Modified: branches/stavangerkommune/bookingfrontend/inc/class.bosearch.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.bosearch.inc.php
2013-06-17 09:08:17 UTC (rev 11182)
+++ branches/stavangerkommune/bookingfrontend/inc/class.bosearch.inc.php
2013-06-17 11:23:17 UTC (rev 11183)
@@ -65,10 +65,11 @@
$event['name'] = $event['building_name']. ' / ' .
$event['description'];
$event['type'] = "Event";
$date =
date('Y-m-d',strtotime($event['from_']));
- $res =
$this->soresource->read(array('filters' => array('id' =>
$event['resources'][0])));
- $event['link'] =
$GLOBALS['phpgw']->link('/bookingfrontend/', array('menuaction' =>
'bookingfrontend.uibuilding.schedule', 'id' =>
$res['results'][0]['building_id'], 'date' => $date));
+ $event_res =
$this->soresource->read(array('filters' => array('id' =>
$event['resources'][0])));
+ $event['link'] =
$GLOBALS['phpgw']->link('/bookingfrontend/', array('menuaction' =>
'bookingfrontend.uibuilding.schedule', 'id' =>
$event_res['results'][0]['building_id'], 'date' => $date));
}
}
+
$final_array = array_merge_recursive($bui_result,
$org_result, $res_result, $event_result);
$final_array['total_records_sum'] =
array_sum((array)$final_array['total_records']);
return $final_array;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11183] bkbooking: stavanger bugfix,
Kjell Arne Espedal <=