[Fmsystem-commits] [7248] bkbooking: bugfix canceletaion booking/allocation

[Kjell Arne Espedal]

Revision: 7248
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7248
Author:   kjell
Date:     2011-05-03 12:18:21 +0000 (Tue, 03 May 2011)
Log Message:
-----------
bkbooking: bugfix canceletaion booking/allocation

Modified Paths:
--------------
    trunk/booking/inc/class.uibooking.inc.php
    trunk/booking/setup/phpgw_no.lang
    trunk/bookingfrontend/inc/class.uibooking.inc.php
    trunk/bookingfrontend/setup/phpgw_no.lang
    trunk/bookingfrontend/setup/setup.inc.php

Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php   2011-05-03 09:21:49 UTC (rev 
7247)
+++ trunk/booking/inc/class.uibooking.inc.php   2011-05-03 12:18:21 UTC (rev 
7248)
@@ -483,6 +483,11 @@
                public function delete()
                {
                        $id = intval(phpgw::get_var('id', 'GET'));
+                       $outseason = phpgw::get_var('outseason', 'GET');
+                       $recurring = phpgw::get_var('recurring', 'GET');
+                       $repeat_untild = phpgw::get_var('repeat_until', 'GET');
+                       $field_interval = 
intval(phpgw::get_var('field_interval', 'GET'));
+                       $delete_allocation = 
phpgw::get_var('delete_allocation', 'GET');
                        $booking = $this->bo->read_single($id);
             $allocation = 
$this->allocation_bo->read_single($booking['allocation_id']);
             $season = $this->season_bo->read_single($booking['season_id']);
@@ -595,7 +600,12 @@
 
                        if ($step < 2) 
             {
-                       self::render_template('booking_delete', array('booking' 
=> $booking
+                       self::render_template('booking_delete', array('booking' 
=> $booking,
+                                       'recurring' => $recurring,
+                                       'outseason' => $outseason,
+                                       'interval' => $field_interval,
+                                       'repeat_until' => $repeat_until,
+                    'delete_allocation' => $delete_allocation,
                 ));
             }
                        elseif ($step == 2) 

Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang   2011-05-03 09:21:49 UTC (rev 7247)
+++ trunk/booking/setup/phpgw_no.lang   2011-05-03 12:18:21 UTC (rev 7248)
@@ -507,7 +507,7 @@
 cancelation    booking no      Avbestilling
 Cancelation of allocation from booking no      Avbestilling av tildeling fra
 Cancelation of booking from    booking no      Avbestilling av booking fra
-To cancel booking use this link        booking no      For å slette bookingen 
bruk lenken
-To cancel allocation use this link     booking no      For å slette 
tildelingen bruk lenken
+To cancel booking use this link booking no     For å slette bookingen bruk 
lenken
+To cancel allocation use this link  booking    no      For å slette 
tildelingen bruk lenken
 Show applications      booking no      Vis søknader
 Show messages  booking no      Vis beskjeder

Modified: trunk/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uibooking.inc.php   2011-05-03 09:21:49 UTC 
(rev 7247)
+++ trunk/bookingfrontend/inc/class.uibooking.inc.php   2011-05-03 12:18:21 UTC 
(rev 7248)
@@ -593,7 +593,7 @@
                                $system_message['email'] = ' ';
                                $system_message['title'] = lang('Cancelation of 
booking from')." ".$booking['group_name'];
                  
-                $system_message['message'] = 
$system_message['message']."\n\n".lang('To cancel booking use this link')." - 
<a href='".self::link(array('menuaction' => 'booking.uibooking.delete','id' => 
$boooking['id'], 'outseason' => $outseason, 'recurring' => $recurring, 
'repeat_until' => $repeat_until, 'field_interval' => $field_interval, 
'delete_allocation' => $delete_allocation))."'>".lang('Delete')."</a>";
+                $system_message['message'] = 
$system_message['message']."\n\n".lang('To cancel booking use this link')." - 
<a href='".self::link(array('menuaction' => 'booking.uibooking.delete','id' => 
$booking['id'], 'outseason' => $outseason, 'recurring' => $recurring, 
'repeat_until' => $repeat_until, 'field_interval' => $field_interval, 
'delete_allocation' => $delete_allocation))."'>".lang('Delete')."</a>";
 
                                $receipt = 
$this->system_message_bo->add($system_message);
                                $this->redirect(array('menuaction' =>  
'bookingfrontend.uibuilding.schedule', 'id' => $system_message['building_id']));

Modified: trunk/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/bookingfrontend/setup/phpgw_no.lang   2011-05-03 09:21:49 UTC (rev 
7247)
+++ trunk/bookingfrontend/setup/phpgw_no.lang   2011-05-03 12:18:21 UTC (rev 
7248)
@@ -326,3 +326,7 @@
 Unable to fill report  bookingfrontend no      Greide ikke å fylle ut rapport
 Cancel booking bookingfrontend no      Avbestill booking
 Cancel allocation      bookingfrontend no      Avbestill tildeling
+Cancelation of allocation from bookingfrontend no      Avbestilling av 
tildeling fra
+Cancelation of booking from    bookingfrontend no      Avbestilling av booking 
fra
+To cancel booking use this link        bookingfrontend no      For å slette 
bookingen bruk lenken
+To cancel allocation use this link     bookingfrontend no      For å slette 
tildelingen bruk lenken

Modified: trunk/bookingfrontend/setup/setup.inc.php
===================================================================
--- trunk/bookingfrontend/setup/setup.inc.php   2011-05-03 09:21:49 UTC (rev 
7247)
+++ trunk/bookingfrontend/setup/setup.inc.php   2011-05-03 12:18:21 UTC (rev 
7248)
@@ -21,7 +21,7 @@
 
        $setup_info['bookingfrontend']['depends'][] = array(
                'appname' => 'booking',
-               'versions' => Array('0.2.00', 
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05','0.2.06')
+               'versions' => Array('0.2.00', 
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05','0.2.06','0.2.07')
        );
 
        $setup_info['bookingfrontend']['depends'][] = array(