[Fmsystem-commits] [7249] Merge 7247:7248 from trunk

[Sigurd Nes]

Revision: 7249
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7249
Author:   sigurdne
Date:     2011-05-03 12:30:32 +0000 (Tue, 03 May 2011)
Log Message:
-----------
Merge 7247:7248 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/booking/inc/class.uibooking.inc.php
    branches/Version-1_0-branch/booking/setup/phpgw_no.lang
    branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
    branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
    branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248

Modified: branches/Version-1_0-branch/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uibooking.inc.php     
2011-05-03 12:18:21 UTC (rev 7248)
+++ branches/Version-1_0-branch/booking/inc/class.uibooking.inc.php     
2011-05-03 12:30:32 UTC (rev 7249)
@@ -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: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang     2011-05-03 
12:18:21 UTC (rev 7248)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang     2011-05-03 
12:30:32 UTC (rev 7249)
@@ -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: 
branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php     
2011-05-03 12:18:21 UTC (rev 7248)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.uibooking.inc.php     
2011-05-03 12:30:32 UTC (rev 7249)
@@ -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: branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang     
2011-05-03 12:18:21 UTC (rev 7248)
+++ branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang     
2011-05-03 12:30:32 UTC (rev 7249)
@@ -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: branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php     
2011-05-03 12:18:21 UTC (rev 7248)
+++ branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php     
2011-05-03 12:30:32 UTC (rev 7249)
@@ -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(