Revision: 1323
http://mrbs.svn.sourceforge.net/mrbs/?rev=1323&view=rev
Author: cimorrison
Date: 2010-04-14 22:06:09 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
Fixed two bugs to do with provisional bookings:
(1) Reminder interval was being ignored in pending.php
(2) Comment did not match default reminder interval in systemdefaults.inc.php
Modified Paths:
--------------
mrbs/trunk/web/pending.php
mrbs/trunk/web/systemdefaults.inc.php
Modified: mrbs/trunk/web/pending.php
===================================================================
--- mrbs/trunk/web/pending.php 2010-04-14 19:57:38 UTC (rev 1322)
+++ mrbs/trunk/web/pending.php 2010-04-14 22:06:09 UTC (rev 1323)
@@ -6,7 +6,7 @@
function display_buttons($row, $is_series)
{
global $PHP_SELF;
- global $user, $remind_interval;
+ global $user, $reminder_interval;
$last_reminded = (empty($row['reminded'])) ? $row['last_updated'] :
$row['reminded'];
$returl = $PHP_SELF;
@@ -52,7 +52,7 @@
else
{
// Work out whether enough time has elapsed since the last reminder
- $not_yet_time = working_time_diff(time(), $last_reminded) <
$remind_interval;
+ $not_yet_time = working_time_diff(time(), $last_reminded) <
$reminder_interval;
// if enough time has passed since the last reminder
// output a "Remind Admin" button, otherwise nothing
Modified: mrbs/trunk/web/systemdefaults.inc.php
===================================================================
--- mrbs/trunk/web/systemdefaults.inc.php 2010-04-14 19:57:38 UTC (rev
1322)
+++ mrbs/trunk/web/systemdefaults.inc.php 2010-04-14 22:06:09 UTC (rev
1323)
@@ -448,7 +448,7 @@
// Interval before reminders can be issued (in seconds). Only
// working days (see below) are included in the calculation
-$reminder_interval = 60*60*24*4; // 2 working days
+$reminder_interval = 60*60*24*2; // 2 working days
// Days of the week that are working days (Sunday = 0, etc.)
$working_days = array(1,2,3,4,5); // Mon-Fri
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
