From a102942d7aaf964fc4995a30eb62a042dbb5cc73 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 20 Oct 2005 13:13:55 +0000 Subject: [PATCH 1/3] Fixed #654 -- Fixed bug in [969]. Thanks, korpios@gmail.com git-svn-id: http://code.djangoproject.com/svn/django/trunk@976 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/dateformat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py index 01903825d4..3620558f09 100644 --- a/django/utils/dateformat.py +++ b/django/utils/dateformat.py @@ -97,7 +97,7 @@ class TimeFormat(Formatter): "Seconds; i.e. '00' to '59'" return '%02d' % self.data.second -class DateFormat(Formatter): +class DateFormat(TimeFormat): year_days = [None, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334] def __init__(self, d): From d8b83674940282c082bb3d2fce3f19bfd1589988 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 20 Oct 2005 13:16:46 +0000 Subject: [PATCH 2/3] Fixed #658 -- Fixed JavaScript calendar widget in IE. Thanks for the patch, kieranholland git-svn-id: http://code.djangoproject.com/svn/django/trunk@977 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../admin/media/js/admin/DateTimeShortcuts.js | 18 ++++++++++++------ django/contrib/admin/media/js/calendar.js | 6 ++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js index 5da6f2f48e..85482c4cd5 100644 --- a/django/contrib/admin/media/js/admin/DateTimeShortcuts.js +++ b/django/contrib/admin/media/js/admin/DateTimeShortcuts.js @@ -77,13 +77,15 @@ var DateTimeShortcuts = { addEvent(clock_box, 'click', DateTimeShortcuts.cancelEventPropagation); quickElement('h2', clock_box, 'Choose a time'); - time_list = quickElement('ul', clock_box, '', 'class', 'timelist'); + time_list = quickElement('ul', clock_box, ''); + time_list.className = 'timelist'; quickElement("a", quickElement("li", time_list, ""), "Now", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());") quickElement("a", quickElement("li", time_list, ""), "Midnight", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '00:00');") quickElement("a", quickElement("li", time_list, ""), "6 a.m.", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '06:00');") quickElement("a", quickElement("li", time_list, ""), "Noon", "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '12:00');") - cancel_p = quickElement('p', clock_box, '', 'class', 'calendar-cancel'); + cancel_p = quickElement('p', clock_box, ''); + cancel_p.className = 'calendar-cancel'; quickElement('a', cancel_p, 'Cancel', 'href', 'javascript:DateTimeShortcuts.dismissClock(' + num + ');'); }, openClock: function(num) { @@ -147,8 +149,10 @@ var DateTimeShortcuts = { // next-prev links var cal_nav = quickElement('div', cal_box, ''); - quickElement('a', cal_nav, '<', 'class', 'calendarnav-previous', 'href', 'javascript:DateTimeShortcuts.drawPrev('+num+');'); - quickElement('a', cal_nav, '>', 'class', 'calendarnav-next', 'href', 'javascript:DateTimeShortcuts.drawNext('+num+');'); + var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', 'javascript:DateTimeShortcuts.drawPrev('+num+');'); + cal_nav_prev.className = 'calendarnav-previous'; + var cal_nav_next = quickElement('a', cal_nav, '>', 'href', 'javascript:DateTimeShortcuts.drawNext('+num+');'); + cal_nav_next.className = 'calendarnav-next'; cal_box.appendChild(cal_nav); // main box @@ -158,7 +162,8 @@ var DateTimeShortcuts = { DateTimeShortcuts.calendars[num].drawCurrent(); // calendar shortcuts - var shortcuts = quickElement('div', cal_box, '', 'class', 'calendar-shortcuts'); + var shortcuts = quickElement('div', cal_box, ''); + shortcuts.className = 'calendar-shortcuts'; quickElement('a', shortcuts, 'Yesterday', 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', -1);'); shortcuts.appendChild(document.createTextNode('\240|\240')); quickElement('a', shortcuts, 'Today', 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', 0);'); @@ -166,7 +171,8 @@ var DateTimeShortcuts = { quickElement('a', shortcuts, 'Tomorrow', 'href', 'javascript:DateTimeShortcuts.handleCalendarQuickLink(' + num + ', +1);'); // cancel bar - var cancel_p = quickElement('p', cal_box, '', 'class', 'calendar-cancel'); + var cancel_p = quickElement('p', cal_box, ''); + cancel_p.className = 'calendar-cancel'; quickElement('a', cancel_p, 'Cancel', 'href', 'javascript:DateTimeShortcuts.dismissCalendar(' + num + ');'); }, openCalendar: function(num) { diff --git a/django/contrib/admin/media/js/calendar.js b/django/contrib/admin/media/js/calendar.js index ad1f0a9734..eeff433bfb 100644 --- a/django/contrib/admin/media/js/calendar.js +++ b/django/contrib/admin/media/js/calendar.js @@ -65,7 +65,8 @@ var CalendarNamespace = { // Draw blanks before first of month tableRow = quickElement('tr', tableBody); for (var i = 0; i < startingPos; i++) { - quickElement('td', tableRow, ' ', 'bgcolor','#f3f3f3'); + var _cell = quickElement('td', tableRow, ' '); + _cell.style.backgroundColor = '#f3f3f3'; } // Draw days of month @@ -81,7 +82,8 @@ var CalendarNamespace = { // Draw blanks after end of month (optional, but makes for valid code) while (tableRow.childNodes.length < 7) { - quickElement('td', tableRow, ' ', 'bgcolor','#f3f3f3'); + var _cell = quickElement('td', tableRow, ' '); + _cell.style.backgroundColor = '#f3f3f3'; } calDiv.appendChild(calTable); From 169f9d2bd3b8940a0de7cc63c765d5d21eced800 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 20 Oct 2005 13:22:20 +0000 Subject: [PATCH 3/3] Fixed #655 -- Improved 'validator_list' section of docs/model-api.txt. git-svn-id: http://code.djangoproject.com/svn/django/trunk@978 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/model-api.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/model-api.txt b/docs/model-api.txt index f355f9fd5e..fa6d8f10e6 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -171,7 +171,14 @@ The following arguments are available to all field types. All are optional. Like ``unique_for_date`` and ``unique_for_month``. ``validator_list`` - A list of extra validators to apply to the field. + A list of extra validators to apply to the field. Each should be a callable + that takes the parameters ``field_data, all_data`` and raises + ``django.core.validators.ValidationError`` for errors. (See the + `validator docs`_.) + + Django comes with quite a few validators. They're in ``django.core.validators``. + +.. _validator docs: http://www.djangoproject.com/documentation/forms/#validators Field types -----------