Navigation

← Previous Changeset
Next Changeset →

Changeset 4087

Timestamp:

11/20/06 10:23:48 (2 years ago)

Author:

adrian

Message:

Fixed #3014 -- Admin 'now' shortcut for DateTimeFields? now updates seconds, too. Thanks for the patch, Esdras Beleza

Files:

django/trunk/AUTHORS (modified) (1 diff)
django/trunk/django/contrib/admin/media/js/admin/DateTimeShortcuts.js (modified) (2 diffs)
django/trunk/django/contrib/admin/media/js/core.js (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

django/trunk/AUTHORS

r3963	r4087
52	52	Ned Batchelder <http://www.nedbatchelder.com/>
53	53	Shannon -jj Behrens <http://jjinux.blogspot.com/>
	54	Esdras Beleza <linux@esdrasbeleza.com>
54	55	James Bennett
55	56	Paul Bissex <http://e-scribe.com/>

django/trunk/django/contrib/admin/media/js/admin/DateTimeShortcuts.js

r3748	r4087
45	45	inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling);
46	46	var now_link = document.createElement('a');
47		now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());");
	47	now_link.setAttribute('href', "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinuteSecond());");
48	48	now_link.appendChild(document.createTextNode(gettext('Now')));
49	49	var clock_link = document.createElement('a');
…	…
81	81	time_list = quickElement('ul', clock_box, '');
82	82	time_list.className = 'timelist';
83		quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinute());")
84		quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '00:00');")
85		quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '06:00');")
86		quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '12:00');")
	83	quickElement("a", quickElement("li", time_list, ""), gettext("Now"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", new Date().getHourMinuteSecond());")
	84	quickElement("a", quickElement("li", time_list, ""), gettext("Midnight"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '00:00:00');")
	85	quickElement("a", quickElement("li", time_list, ""), gettext("6 a.m."), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '06:00:00');")
	86	quickElement("a", quickElement("li", time_list, ""), gettext("Noon"), "href", "javascript:DateTimeShortcuts.handleClockQuicklink(" + num + ", '12:00:00');")
87	87
88	88	cancel_p = quickElement('p', clock_box, '');

django/trunk/django/contrib/admin/media/js/core.js

r3287	r4087
120	120	}
121	121
	122	Date.prototype.getTwoDigitSecond = function() {
	123	return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds();
	124	}
	125
122	126	Date.prototype.getISODate = function() {
123	127	return this.getCorrectYear() + '-' + this.getTwoDigitMonth() + '-' + this.getTwoDigitDate();
…	…
126	130	Date.prototype.getHourMinute = function() {
127	131	return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute();
	132	}
	133
	134	Date.prototype.getHourMinuteSecond = function() {
	135	return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond();
128	136	}
129	137

Code