Changeset:
9787b28ead03
https://sourceforge.net/p/mrbs/hg-code/ci/9787b28ead03be87ed59d3cb0c5e4ba3e60e13e7
Author:
Campbell Morrison <[email protected]>
Date:
Mon Feb 15 10:21:42 2016 +0000
Log message:
Added room name to conflict details following suggestion on general mailing
list.
diffstat:
web/mrbs_sql.inc | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diffs (38 lines):
diff -r 5bf86b598e53 -r 9787b28ead03 web/mrbs_sql.inc
--- a/web/mrbs_sql.inc Mon Feb 15 09:50:20 2016 +0000
+++ b/web/mrbs_sql.inc Mon Feb 15 10:21:42 2016 +0000
@@ -17,7 +17,7 @@
*/
function mrbsCheckFree(&$booking, $ignore, $repignore)
{
- global $tbl_entry;
+ global $tbl_entry, $tbl_room;
global $enable_periods, $periods, $twentyfourhour_format;
global $strftime_format, $is_private_field;
@@ -27,11 +27,12 @@
get_area_settings(get_area($room_id));
// Select any meetings which overlap for this room:
- $sql = "SELECT id, name, start_time, create_by, status
- FROM $tbl_entry
- WHERE start_time < ${booking['end_time']}
+ $sql = "SELECT E.id, name, start_time, create_by, status, room_name
+ FROM $tbl_entry E, $tbl_room R
+ WHERE E.room_id=R.id
+ AND start_time < ${booking['end_time']}
AND end_time > ${booking['start_time']}
- AND room_id = $room_id";
+ AND E.room_id = $room_id";
if ($ignore > 0)
{
@@ -86,7 +87,7 @@
// enclose the viewday etc. links in a span to make it easier for
JavaScript to strip them out
$err[] = "<a
href=\"view_entry.php?id=".$row['id']."\">".$row['name']."</a>"
- . " (" . $startstr . ") "
+ . " (" . $startstr . ', ' . $row['room_name'] .") "
. "<span>(<a href=\"day.php?$param_ymd\">".get_vocab("viewday")."</a>"
. " | <a
href=\"week.php?room=$room_id&$param_ymd\">".get_vocab("viewweek")."</a>"
. " | <a
href=\"month.php?room=$room_id&$param_ym\">".get_vocab("viewmonth")."</a>)</span>";
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
