[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7503] Merge 7500:7502 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7503] Merge 7500:7502 from trunk |
|
Date: |
Tue, 16 Aug 2011 11:36:07 +0000 |
Revision: 7503
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7503
Author: sigurdne
Date: 2011-08-16 11:36:06 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
Merge 7500:7502 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.uibooking.inc.php
branches/Version-1_0-branch/booking/templates/base/booking_new_preview.xsl
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,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499
+
/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,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502
Modified: branches/Version-1_0-branch/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uibooking.inc.php
2011-08-16 11:09:22 UTC (rev 7502)
+++ branches/Version-1_0-branch/booking/inc/class.uibooking.inc.php
2011-08-16 11:36:06 UTC (rev 7503)
@@ -184,6 +184,9 @@
$booking = array();
$booking['cost'] = 0;
$allocation_id = phpgw::get_var('allocation_id', 'int',
'GET');
+ if (isset($_POST['application_id'])) {
+ $application_id =
phpgw::get_var('application_id', 'int', 'POST');
+ }
$booking['building_id'] = phpgw::get_var('building_id',
'int', 'GET');
$booking['resources'] = phpgw::get_var('resources',
'int', 'GET');
#The string replace is a workaround for a problem at Bergen
Kommune
@@ -196,8 +199,7 @@
if (! isset($allocation_id)) $noallocation = 1;
$invalid_dates = array();
$valid_dates = array();
-
-
+
if(isset($allocation_id))
{
$allocation =
$this->allocation_bo->read_single($allocation_id);
@@ -216,11 +218,12 @@
$noallocation = 1;
}
+
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
$today = getdate();
$booking = extract_values($_POST,
$this->fields);
-
+
if(strlen($_POST['from_']) < 6)
{
$date_from = array($time_from[0],
$_POST['from_']);
@@ -265,7 +268,7 @@
if (!$errors && $_POST['recurring'] != 'on' &&
$_POST['outseason'] != 'on')
{
- if( isset($noallocation)) {
+ if( isset($noallocation)) {
$allocation['resources'] = $booking['resources'];
$allocation['cost'] = $booking['cost'];
$allocation['building_id'] = $booking['building_id'];
@@ -273,6 +276,9 @@
$allocation['season_id'] = $booking['season_id'];
$allocation['organization_id'] =
$booking['organization_id'];
$allocation['organization_name'] =
$booking['organization_name'];
+ if ($application_id != '0') {
+ $allocation['application_id'] =
$application_id;
+ }
$allocation['from_'] = $booking['from_'];
$allocation['to_'] = $booking['to_'];
$allocation['active'] = '1';
@@ -332,17 +338,26 @@
$allocation['season_id'] =
$booking['season_id'];
$allocation['organization_id'] =
$booking['organization_id'];
$allocation['organization_name'] =
$booking['organization_name'];
+ if
($application_id != '0') {
+
$allocation['application_id'] = $application_id;
+ }
$allocation['from_'] = $booking['from_'];
$allocation['to_'] = $booking['to_'];
$allocation['active'] =
'1';
$allocation['completed'] = '0';
$receipt =
$this->allocation_bo->add($allocation);
$booking['allocation_id'] = $receipt['id'];
+ if
($application_id != '0') {
+
$booking['application_id'] = $application_id;
+ }
$booking['secret'] = $this->generate_secret();
$receipt =
$this->bo->add($booking);
$booking['allocation_id'] = '';
$this->allocation_bo->so->update_id_string();
} else {
+ if
($application_id != '0') {
+
$booking['application_id'] = $application_id;
+ }
$booking['secret'] = $this->generate_secret();
$receipt =
$this->bo->add($booking);
}
@@ -352,11 +367,15 @@
}
if ($step == 3)
{
-
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule',
'id'=>$booking['building_id']));
+ if ($application_id != '0') {
+
$this->redirect(array('menuaction' => 'booking.uiapplication.show',
'id'=>$application_id));
+
+ } else {
+
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule',
'id'=>$booking['building_id']));
+ }
}
}
}
-
$this->flash_form_errors($errors);
self::add_javascript('booking', 'booking',
'booking.js');
array_set_default($booking, 'resources', array());
@@ -387,7 +406,9 @@
'outseason' => $_POST['outseason'],
'date_from' => $time_from[0],
'date_to' => $time_to[0],
+ 'application_id' => $application_id,
'noallocation' => $noallocation)
+
);
}
else if ($step == 2)
@@ -406,6 +427,7 @@
'valid_dates' => $valid_dates,
'invalid_dates' => $invalid_dates,
'groups' => $groups,
+ 'application_id' => $application_id,
'noallocation' => $noallocation)
);
}
Modified:
branches/Version-1_0-branch/booking/templates/base/booking_new_preview.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/booking_new_preview.xsl
2011-08-16 11:09:22 UTC (rev 7502)
+++ branches/Version-1_0-branch/booking/templates/base/booking_new_preview.xsl
2011-08-16 11:36:06 UTC (rev 7503)
@@ -16,6 +16,7 @@
<input type="hidden" name="organization_id"
value="{booking/organization_id}"/>
<input type="hidden" name="organization_name"
value="{booking/organization_name}"/>
<input type="hidden" name="allocation_id"
value="{booking/allocation_id}"/>
+ <input type="hidden" name="application_id"
value="{booking/application_id}"/>
<input type="hidden" name="noallocation"
value="{noallocation}" />
<input type="hidden" name="step" value="{step}" />
<input type="hidden" name="from_" value="{from_date}" />
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7503] Merge 7500:7502 from trunk,
Sigurd Nes <=