[Fmsystem-commits] [15669] Stable: Merge 15666:15668 from trunk

[sigurdne]

Revision: 15669
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15669
Author:   sigurdne
Date:     2016-09-14 14:42:37 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
Stable: Merge 15666:15668 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
    branches/Version-2_0-branch/booking/templates/base/event_info.xsl

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/booking/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668


Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668

Modified: branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uievent.inc.php       
2016-09-14 14:40:28 UTC (rev 15668)
+++ branches/Version-2_0-branch/booking/inc/class.uievent.inc.php       
2016-09-14 14:42:37 UTC (rev 15669)
@@ -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: branches/Version-2_0-branch/booking/templates/base/event_info.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/event_info.xsl   
2016-09-14 14:40:28 UTC (rev 15668)
+++ branches/Version-2_0-branch/booking/templates/base/event_info.xsl   
2016-09-14 14:42:37 UTC (rev 15669)
@@ -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>