[Fmsystem-commits] [15668] boking: fix lookup

[sigurdne]

Revision: 15668
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15668
Author:   sigurdne
Date:     2016-09-14 14:40:28 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
boking: fix lookup

Modified Paths:
--------------
    trunk/booking/inc/class.uievent.inc.php
    trunk/booking/templates/base/event_info.xsl

Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php     2016-09-14 12:51:08 UTC (rev 
15667)
+++ trunk/booking/inc/class.uievent.inc.php     2016-09-14 14:40:28 UTC (rev 
15668)
@@ -1062,7 +1062,7 @@
                        $event['resource'] = phpgw::get_var('resource');
                        $event['resource_info'] = join(', ', $res_names);
                        $event['building_link'] = self::link(array('menuaction' 
=> 'booking.uibuilding.show',
-                                       'id' => 
$event['resources'][0]['building_id']));
+                                       'id' => 
$event['resources'][0]['buildings'][0]));
                        $event['org_link'] = self::link(array('menuaction' => 
'booking.uiorganization.show',
                                        'id' => $event['organization_id']));
                        $event['add_link'] = self::link(array('menuaction' => 
'booking.uibooking.add',

Modified: trunk/booking/templates/base/event_info.xsl
===================================================================
--- trunk/booking/templates/base/event_info.xsl 2016-09-14 12:51:08 UTC (rev 
15667)
+++ trunk/booking/templates/base/event_info.xsl 2016-09-14 14:40:28 UTC (rev 
15668)
@@ -17,9 +17,9 @@
                        </label>
                        <a href="{event/building_link}">
                                <xsl:value-of 
select="event/resources[position()=1]/building_name"/>
+                               (<xsl:value-of select="event/resource_info"/>)
                        </a>
-                       (<xsl:value-of select="event/resource_info"/>)
-               </div>
+                       </div>
                <div class="pure-control-group">
                        <label>
                                <h4>