Revision: 2625
https://sourceforge.net/p/mrbs/code/2625/
Author: cimorrison
Date: 2012-12-29 20:46:42 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Made the header work with the new tables
Modified Paths:
--------------
mrbs/branches/linked_bookings/web/Themes/default/header.inc
Modified: mrbs/branches/linked_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/linked_bookings/web/Themes/default/header.inc 2012-12-29
20:41:08 UTC (rev 2624)
+++ mrbs/branches/linked_bookings/web/Themes/default/header.inc 2012-12-29
20:46:42 UTC (rev 2625)
@@ -8,7 +8,7 @@
{
global $mrbs_company, $mrbs_company_logo, $mrbs_company_url,
$mrbs_company_more_info,
$search_str, $locale_warning;
- global $tbl_entry, $tbl_room, $tbl_area;
+ global $tbl_entry, $tbl_room, $tbl_area, $tbl_room_entry;
global $PHP_SELF, $HTTP_HOST, $QUERY_STRING;
global $view_week_number, $weekstarts, $times_along_top, $periods,
$enable_periods;
global $auth, $max_level;
@@ -158,10 +158,11 @@
// Find out how many bookings are awaiting approval
// (but only for areas where approval is required)
$sql = "SELECT COUNT(*)
- FROM $tbl_entry E, $tbl_room R, $tbl_area A
+ FROM $tbl_entry E, $tbl_room R, $tbl_area A,
$tbl_room_entry RE
WHERE (status&" . STATUS_AWAITING_APPROVAL . " != 0)
- AND E.room_id = R.id
- AND R.area_id = A.id
+ AND E.id=RE.entry_id
+ AND RE.room_id=R.id
+ AND R.area_id=A.id
AND R.disabled = 0
AND A.disabled = 0
AND $sql_approval_enabled";
------------------------------------------------------------------------------
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
