Revision: 2723
https://sourceforge.net/p/mrbs/code/2723/
Author: cimorrison
Date: 2013-03-12 17:09:09 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Made Export work for This And Future
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 16:42:44 UTC
(rev 2722)
+++ mrbs/branches/this_and_future/web/view_entry.php 2013-03-12 17:09:09 UTC
(rev 2723)
@@ -162,6 +162,7 @@
$private = $row['status'] & STATUS_PRIVATE;
$writeable = getWritable($row['create_by'], $user, $row['room_id']);
$keep_private = (is_private_event($private) && !$writeable);
+$start_time = $row['start_time'];
// Work out when the last reminder was sent
$last_reminded = (empty($row['reminded'])) ? $row['last_updated'] :
$row['reminded'];
@@ -249,6 +250,11 @@
$sql .= " AND E.room_id=R.id
AND R.area_id=A.id";
+ if ($time_subset == THIS_AND_FUTURE)
+ {
+ $sql .= " AND E.start_time>=$start_time";
+ }
+
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
