Revision: 2720
https://sourceforge.net/p/mrbs/code/2720/
Author: cimorrison
Date: 2013-03-12 14:32:45 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Made Export Whole Series work
Modified Paths:
--------------
mrbs/branches/this_and_future/web/view_entry.php
Modified: mrbs/branches/this_and_future/web/view_entry.php
===================================================================
--- mrbs/branches/this_and_future/web/view_entry.php 2013-03-12 10:36:35 UTC
(rev 2719)
+++ mrbs/branches/this_and_future/web/view_entry.php 2013-03-12 14:32:45 UTC
(rev 2720)
@@ -229,13 +229,13 @@
. sql_syntax_timestamp_to_unix("E.timestamp") . " AS last_updated, "
. "A.area_name, R.room_name, "
. "A.approval_enabled, A.confirmation_enabled";
- if ($series)
+ if ($time_subset != THIS_ENTRY)
{
// If it's a series we want the repeat information
$sql .= ", T.rep_type, T.end_date, T.rep_opt, T.rep_num_weeks";
}
$sql .= " FROM $tbl_area A, $tbl_room R, $tbl_entry E";
- if ($series)
+ if ($time_subset != THIS_ENTRY)
{
$sql .= ", $tbl_repeat T"
. " WHERE E.repeat_id=$repeat_id"
@@ -249,7 +249,7 @@
$sql .= " AND E.room_id=R.id
AND R.area_id=A.id";
- if ($series)
+ if ($time_subset != THIS_ENTRY)
{
$sql .= " ORDER BY E.ical_recur_id";
}
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
