[Fmsystem-commits] [17357] bookingfrontend: event info

[sigurdne]

Revision: 17357
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17357
Author:   sigurdne
Date:     2017-11-23 09:34:21 -0500 (Thu, 23 Nov 2017)
Log Message:
-----------
bookingfrontend: event info

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

Modified: trunk/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uievent.inc.php     2017-11-23 12:04:49 UTC 
(rev 17356)
+++ trunk/bookingfrontend/inc/class.uievent.inc.php     2017-11-23 14:34:21 UTC 
(rev 17357)
@@ -399,7 +399,7 @@
                        }
                        $event['resource_info'] = join(', ', $res_names);
                        $event['building_link'] = self::link(array('menuaction' 
=> 'bookingfrontend.uibuilding.show',
-                                       'id' => 
$event['resources'][0]['building_id']));
+                                       'id' => $event['building_id']));
                        $event['when'] = pretty_timestamp($event['from_']) . ' 
- ' . pretty_timestamp($event['to_']);
                        $bouser = CreateObject('bookingfrontend.bouser');
                        if 
($bouser->is_organization_admin($event['customer_organization_id']))

Modified: trunk/bookingfrontend/templates/base/event_info.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/event_info.xsl 2017-11-23 12:04:49 UTC 
(rev 17356)
+++ trunk/bookingfrontend/templates/base/event_info.xsl 2017-11-23 14:34:21 UTC 
(rev 17357)
@@ -13,7 +13,7 @@
                </dt>
                <dd>
                        <a href="{event/building_link}">
-                               <xsl:value-of 
select="event/resources[position()=1]/building_name"/>
+                               <xsl:value-of select="event/building_name"/>
                        </a>
                        (<xsl:value-of select="event/resource_info"/>)
                </dd>