[Fmsystem-commits] [6602] bkbooking: bugfix booking failed when recurring

[Kjell Arne Espedal]

Revision: 6602
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6602
Author:   kjell
Date:     2010-11-16 15:02:12 +0000 (Tue, 16 Nov 2010)
Log Message:
-----------
bkbooking: bugfix booking failed when recurring

Modified Paths:
--------------
    trunk/booking/inc/class.uibooking.inc.php
    trunk/booking/templates/base/booking_new_preview.xsl

Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php   2010-11-16 13:02:23 UTC (rev 
6601)
+++ trunk/booking/inc/class.uibooking.inc.php   2010-11-16 15:02:12 UTC (rev 
6602)
@@ -181,8 +181,9 @@
                {
                        $errors = array();
                        $booking = array();
-                       $booking['building_id'] = phpgw::get_var('building_id', 
'int', 'GET');
+                       $booking['cost'] = 0;
                        $allocation_id = phpgw::get_var('allocation_id', 'int', 
'GET');
+                       $booking['building_id'] = phpgw::get_var('building_id', 
'int', 'GET');
                        $booking['resources'] = phpgw::get_var('resources', 
'int', 'GET');
                        $booking['from_'] = phpgw::get_var('from_', 'str', 
'GET');
                        $booking['to_'] = phpgw::get_var('to_', 'str', 'GET');
@@ -204,7 +205,8 @@
                                array_set_default($booking, 'resources', 
array(get_var('resource', int, 'GET')));
                                $booking['organization_id'] = 
$allocation['organization_id'];
                                $booking['organization_name'] = 
$allocation['organization_name'];
-               }
+                       }
+
                        if($_SERVER['REQUEST_METHOD'] == 'POST')
                        {
                                $today = getdate();
@@ -218,10 +220,7 @@
                                        $booking['to_'] = join(" ",$date_to); 
                                        $_POST['to_'] = join(" ",$date_to);
                                }                               
-                               $booking['building_name'] = $building['name'];
-                               $booking['building_id'] = $building['id'];
                                $booking['active'] = '1';
-                               $booking['cost'] = 0;
                                $booking['completed'] = '0';
                                $booking['reminder'] = '1';
                                $booking['secret'] = $this->generate_secret();

Modified: trunk/booking/templates/base/booking_new_preview.xsl
===================================================================
--- trunk/booking/templates/base/booking_new_preview.xsl        2010-11-16 
13:02:23 UTC (rev 6601)
+++ trunk/booking/templates/base/booking_new_preview.xsl        2010-11-16 
15:02:12 UTC (rev 6602)
@@ -11,11 +11,13 @@
 
            <form action="" method="POST">
                        <input type="hidden" name="season_id" 
value="{booking/season_id}"/>
-                       <input type="hidden" name="field_building_id" 
value="{booking/building_id}"/>
+                       <input type="hidden" name="building_id" 
value="{booking/building_id}"/>
+                       <input type="hidden" name="building_name" 
value="{booking/building_name}"/>
                        <input type="hidden" name="allocation_id" 
value="{booking/allocation_id}"/>
                        <input type="hidden" name="step" value="{step}" />
                        <input type="hidden" name="from_" value="{from_date}" />
                        <input type="hidden" name="to_" value="{to_date}" />
+                       <input type="hidden" name="cost" value="{booking/cost}" 
/>
                        <input type="hidden" name="repeat_until" 
value="{repeat_until}" />
                        <input type="hidden" name="field_interval" 
value="{interval}" />
                        <input type="hidden" name="recurring" 
value="{recurring}" />