rbrindley: branch rbrindley/astman_revamp r4627 - in /team/rbrindley/astman_r...

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Thu Mar 12 11:31:45 2009
New Revision: 4627

URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4627
Log:

- included object.customs.js in timeintervals page
- endttime ---> endtime
- force interal.days as a string (downside of JS :-/)
- if DayofWeek is selected, not is not


Modified:
    team/rbrindley/astman_revamp/config/js/timeintervals.js
    team/rbrindley/astman_revamp/config/timeintervals.html

Modified: team/rbrindley/astman_revamp/config/js/timeintervals.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/timeintervals.js?view=diff&rev=4627&r1=4626&r2=4627
==============================================================================
--- team/rbrindley/astman_revamp/config/js/timeintervals.js (original)
+++ team/rbrindley/astman_revamp/config/js/timeintervals.js Thu Mar 12 11:31:45 2009
@@ -81,17 +81,18 @@
 			var endtime = ASTGUI.miscFunctions.AMPM_to_asteriskTime(end) || '24:00';
 
 			if (starttime !== '00:00' || endtime !== '24:00') {
-				interval.time = starttime + '-' + endttime;
-			}
-		}
-
-		if (!$('#edit_ti_byDayofWeek:selected').length) {
+				interval.time = starttime + '-' + endtime;
+			}
+		}
+
+		if ($('#ti_byDayofWeek:selected').length) {
 			interval.weekdays = $('#edit_ti_dayofweek_start').val() + '-' + $('#edit_ti_dayofweek_end').val();
 		}
 
 		if ($('#ti_type_byGroupofDates:selected').length) {
 			interval.days = $('#edit_ti_from_date').val();
 
+			interval.days = interval.days.toString();
 			if (!interval.days.valiDate()) {
 				ASTGUI.highlightField('edit_ti_from_date', 'Invalid Date Range!');
 				return;

Modified: team/rbrindley/astman_revamp/config/timeintervals.html
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/timeintervals.html?view=diff&rev=4627&r1=4626&r2=4627
==============================================================================
--- team/rbrindley/astman_revamp/config/timeintervals.html (original)
+++ team/rbrindley/astman_revamp/config/timeintervals.html Thu Mar 12 11:31:45 2009
@@ -174,6 +174,7 @@
 
 <script src="js/jquery.js"></script>
 <script src="js/astman.js"></script>
+<script src="js/object.customs.js"></script>
 <script src="js/timeintervals.js"></script>
 <script src="js/jquery.tooltip.js"></script>
 <script src="js/jquery.date_input.js"></script>