Changeset:
e97775100e4d
https://sourceforge.net/p/mrbs/hg-code/ci/e97775100e4d2ad6bb2c0650cdd6a4192794a733
Author:
Campbell Morrison <[email protected]>
Date:
Wed Aug 17 16:48:35 2016 +0100
Log message:
Fixed bug introduced in changeset ccbec44d3779 causing resized bookings to be
set the to the default type.
diffstat:
web/functions_table.inc | 2 +-
web/js/resizable.js.php | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diffs (26 lines):
diff -r 68f49b0e54e5 -r e97775100e4d web/functions_table.inc
--- a/web/functions_table.inc Wed Aug 17 15:02:10 2016 +0100
+++ b/web/functions_table.inc Wed Aug 17 16:48:35 2016 +0100
@@ -532,7 +532,7 @@
}
else // if it is booked then show the booking
{
- $html .= "<div data-id=\"$id\" class=\"celldiv slots" .
+ $html .= "<div data-id=\"$id\" data-type=\"$color\" class=\"celldiv
slots" .
(($times_along_top) ? "1" : $slots) .
"\">\n";
$html .= "<a href=\"view_entry.php?id=$id&".
$query_strings['booking'] . "\" title=\"$long_descr\">";
diff -r 68f49b0e54e5 -r e97775100e4d web/js/resizable.js.php
--- a/web/js/resizable.js.php Wed Aug 17 15:02:10 2016 +0100
+++ b/web/js/resizable.js.php Wed Aug 17 16:48:35 2016 +0100
@@ -992,8 +992,9 @@
day: args.day,
month: args.month,
year: args.year};
- <?php // get the booking id ?>
+ <?php // get the booking id and type ?>
data.id = divClone.data('id');
+ data.type = divClone.data('type');
<?php // get the other parameters ?>
var oldParams = getBookingParams(table, tableData,
divBooking);
var newParams = getBookingParams(table, tableData,
divClone);
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
