Revision: 2480
https://sourceforge.net/p/mrbs/code/2480/
Author: cimorrison
Date: 2012-10-09 15:29:51 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Made the repeat day correspond to the calendar day, not the booking day
Modified Paths:
--------------
mrbs/branches/improved_repeat_interface/web/edit_entry.php
Modified: mrbs/branches/improved_repeat_interface/web/edit_entry.php
===================================================================
--- mrbs/branches/improved_repeat_interface/web/edit_entry.php 2012-10-09
15:12:05 UTC (rev 2479)
+++ mrbs/branches/improved_repeat_interface/web/edit_entry.php 2012-10-09
15:29:51 UTC (rev 2480)
@@ -977,16 +977,6 @@
$description = $default_description;
$type = $default_type;
$room_id = $room;
- $rep_id = 0;
- if (!isset($rep_type)) // We might have set it through a drag selection
- {
- $rep_type = REP_NONE;
- $rep_end_day = $day;
- $rep_end_month = $month;
- $rep_end_year = $year;
- }
- $rep_day = array(date('w', mktime(12, 0, 0, $month, $day, $year)));
- $rep_num_weeks = 1;
$private = $private_default;
$confirmed = $confirmed_default;
@@ -1045,6 +1035,17 @@
$pm7 = get_start_last_slot($month, $day, $year);
$end_time = min($end_time, $pm7 + $resolution);
}
+
+ $rep_id = 0;
+ if (!isset($rep_type)) // We might have set it through a drag selection
+ {
+ $rep_type = REP_NONE;
+ $rep_end_day = $day;
+ $rep_end_month = $month;
+ $rep_end_year = $year;
+ }
+ $rep_day = array(date('w', $start_time));
+ $rep_num_weeks = 1;
}
$start_hour = strftime('%H', $start_time);
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
