[Fmsystem-commits] [12051] bkbooking: stavanger fix resource add application

[Kjell Arne Espedal]

Revision: 12051
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12051
Author:   kjell
Date:     2014-08-07 08:17:19 +0000 (Thu, 07 Aug 2014)
Log Message:
-----------
bkbooking: stavanger fix resource add application

Modified Paths:
--------------
    branches/stavangerkommune/bookingfrontend/inc/class.uiresource.inc.php
    
branches/stavangerkommune/bookingfrontend/templates/stavanger/resource_schedule.xsl

Modified: branches/stavangerkommune/bookingfrontend/inc/class.uiresource.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uiresource.inc.php      
2014-08-05 12:29:50 UTC (rev 12050)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uiresource.inc.php      
2014-08-07 08:17:19 UTC (rev 12051)
@@ -14,7 +14,8 @@
                {
                        parent::__construct();
                        $this->bo = CreateObject('booking.boresource');
-                       $old_top = array_pop($this->tmpl_search_path);
+            $this->building_bo = CreateObject('booking.bobuilding');
+            $old_top = array_pop($this->tmpl_search_path);
                        array_push($this->tmpl_search_path, PHPGW_SERVER_ROOT . 
'/booking/templates/base');
                        array_push($this->tmpl_search_path, $old_top);
                }
@@ -41,8 +42,18 @@
                public function schedule()
                {
             $resource = $this->bo->get_schedule(phpgw::get_var('id', 'GET'), 
'bookingfrontend.uibuilding', 'bookingfrontend.uiresource', 
'bookingfrontend.uisearch.index');
-                       $resource['application_link'] = 
self::link(array('menuaction' => 'bookingfrontend.uiapplication.add', 
'building_id' => $resource['building_id'], 
'building_name'=>$resource['building_name'], 'resource' => $resource['id']));
-                       $resource['datasource_url'] = self::link(array(
+            $building = 
$this->building_bo->read_single($resource['building_id']);
+            $resource['deactivate_application'] = 
$building['deactivate_application'];
+            if ($building['deactivate_application'] == 0) {
+                $resource['application_link'] = self::link(array('menuaction' 
=> 'bookingfrontend.uiapplication.add',
+                    'building_id' => $resource['building_id'],
+                    'building_name'=>$resource['building_name'],
+                    'resource' => $resource['id']));
+            } else {
+                $resource['application_link'] = self::link(array('menuaction' 
=> 'bookingfrontend.uiresource.schedule',
+                    'id' => $resource['id']));
+            }
+            $resource['datasource_url'] = self::link(array(
                                'menuaction' => 
'bookingfrontend.uibooking.resource_schedule', 
                                'resource_id' => $resource['id'], 
                                'phpgw_return_as' => 'json',

Modified: 
branches/stavangerkommune/bookingfrontend/templates/stavanger/resource_schedule.xsl
===================================================================
--- 
branches/stavangerkommune/bookingfrontend/templates/stavanger/resource_schedule.xsl
 2014-08-05 12:29:50 UTC (rev 12050)
+++ 
branches/stavangerkommune/bookingfrontend/templates/stavanger/resource_schedule.xsl
 2014-08-07 08:17:19 UTC (rev 12051)
@@ -21,7 +21,9 @@
             <li><xsl:value-of select="php:function('lang', 'schedule')"/></li>
                </ul>
 
-               <button 
onclick="window.location.href='{resource/application_link}'"><xsl:value-of 
select="php:function('lang', 'New booking application')" /></button>
+        <xsl:if test="resource/deactivate_application=0">
+            <button 
onclick="window.location.href='{resource/application_link}'"><xsl:value-of 
select="php:function('lang', 'New booking application')" /></button>
+        </xsl:if>
 
                <xsl:call-template name="msgbox"/>
                <ul id="week-selector">