Revision: 2621
https://sourceforge.net/p/mrbs/code/2621/
Author: cimorrison
Date: 2012-12-29 20:19:22 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Made pending.php work with the new tables
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/pending.php
Modified: mrbs/branches/linked_bookings/web/pending.php
===================================================================
--- mrbs/branches/linked_bookings/web/pending.php 2012-12-29 20:05:32 UTC
(rev 2620)
+++ mrbs/branches/linked_bookings/web/pending.php 2012-12-29 20:19:22 UTC
(rev 2621)
@@ -207,15 +207,16 @@
$sql_approval_enabled = some_area_predicate('approval_enabled');
-$sql = "SELECT E.id, E.name, E.room_id, E.start_time, E.create_by, " .
+$sql = "SELECT E.id, E.name, RE.room_id, E.start_time, E.create_by, " .
sql_syntax_timestamp_to_unix("E.timestamp") . " AS last_updated,
E.reminded, E.repeat_id,
M.room_name, M.area_id, A.area_name, A.enable_periods,
E.info_time AS entry_info_time, E.info_user AS entry_info_user,
T.info_time AS repeat_info_time, T.info_user AS repeat_info_user
- FROM $tbl_room AS M, $tbl_area AS A, $tbl_entry AS E
+ FROM $tbl_room AS M, $tbl_area AS A, $tbl_room_entry AS RE,
$tbl_entry AS E
LEFT JOIN $tbl_repeat AS T ON E.repeat_id=T.id
- WHERE E.room_id = M.id
+ WHERE E.id=RE.entry_id
+ AND RE.room_id = M.id
AND M.area_id = A.id
AND M.disabled = 0
AND A.disabled = 0
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
