--- a/static/js/forms.js Thu Dec 23 22:56:43 2010 +0200
+++ b/static/js/forms.js Fri Dec 24 00:05:38 2010 +0200
@@ -3,15 +3,6 @@
*/
(function($) {
- /*
- * Form field is empty - i.e. null value
- *
- * Pure whitespace also counts
- */
- $.fn.empty = function () {
- return !this.val() || $.trim(this.val()) == "";
- }
-
/**
* Query or set form field disabled state
*/
--- a/svv/orders.py Thu Dec 23 22:56:43 2010 +0200
+++ b/svv/orders.py Fri Dec 24 00:05:38 2010 +0200
@@ -578,26 +578,22 @@
$(document).ready(function () {
var event_start = $('#event_start');
var event_end = $('#event_end');
-
-/* Buggy shit doesn't work
-
- {
- beforeShow: function (input, inst) {
- // copy default value from event_start
- event_end.datetimepicker("option", "defaultDate", event_start.datetimepicker("getDate"));
- }
- }
-
+
+ // XXX: datetimepicker breaks beforeShow completely (event having one breaks)
event_start.change(function () {
// copy value as default
var start_date = event_start.datetimepicker("getDate");
-
- event_end.datetimepicker("option", "defaultDate", start_date);
+
+ if (start_date) {
+ event_end.datetimepicker("option", {
+ defaultDate: start_date,
+ minDate: start_date,
+ });
+ }
});
// init default as well
event_start.change();
-*/
});""" ),
)
@@ -657,9 +653,14 @@
self.render_text_input('event_description', self.event_description, multiline=True)
)),
- self.render_form_field('event_start', u"Ajankohta", u"Tapahtuman ajankohta (kamat noudetaan - palautetaan)", (
- self.render_event_input()
- )),
+ self.render_form_field('event_start', u"Ajankohta",
+ (
+ u"Tapahtuman ajankohta (kamat noudetaan - palautetaan)",
+ tags.br(),
+ u"(%s)" % (datetime.datetime.now().strftime(self.DATETIME_FORMAT)),
+ ),
+ (self.render_event_input()),
+ ),
),
),