1.1 --- a/actions/EventAggregatorNewEvent.py Sun Sep 11 19:27:16 2011 +0200
1.2 +++ b/actions/EventAggregatorNewEvent.py Sun Sep 11 19:53:17 2011 +0200
1.3 @@ -136,13 +136,13 @@
1.4 "start_offset_default" : escattr(form.get("start-offset", [""])[0]),
1.5
1.6 "end_label" : escape(_("End date (day, month, year) - if different")),
1.7 - "end_day_default" : escattr(form.get("end-day", [""])[0] or form.get("start-day", [""])[0]),
1.8 + "end_day_default" : escattr(form.get("end-day", [""])[0].strip() or form.get("start-day", [""])[0]),
1.9 "end_year_default" : escattr(end_year_default),
1.10 "end_time_label" : escape(_("End time (hour, minute, second)")),
1.11 "end_hour_default" : escattr(form.get("end-hour", [""])[0]),
1.12 "end_minute_default" : escattr(form.get("end-minute", [""])[0]),
1.13 "end_second_default" : escattr(form.get("end-second", [""])[0]),
1.14 - "end_offset_default" : escattr(form.get("end-offset", [""])[0] or form.get("start-offset", [""])[0]),
1.15 + "end_offset_default" : escattr(form.get("end-offset", [""])[0].strip() or form.get("start-offset", [""])[0]),
1.16
1.17 "title_label" : escape(_("Event title/summary")),
1.18 "title_default" : escattr(form.get("title", [""])[0]),
1.19 @@ -154,7 +154,7 @@
1.20 "latitude_default" : escattr(form.get("latitude", [""])[0]),
1.21 "longitude_label" : escape(_("Longitude")),
1.22 "longitude_default" : escattr(form.get("longitude", [""])[0]),
1.23 - "link_label" : escape(_("Event URL")),
1.24 + "link_label" : escape(_("External URL")),
1.25 "link_default" : escattr(form.get("link", [""])[0]),
1.26
1.27 "topics_label" : escape(_("Topics")),
1.28 @@ -162,7 +162,7 @@
1.29 "remove_topic_label" : escape(_("Remove topic")),
1.30
1.31 "template_label" : escape(_("Event template")),
1.32 - "template_default" : escattr(form.get("template", [""])[0] or template_default),
1.33 + "template_default" : escattr(form.get("template", [""])[0].strip() or template_default),
1.34 "parent_label" : escape(_("Parent page")),
1.35 "parent_default" : escattr(form.get("parent", [""])[0]),
1.36
1.37 @@ -548,7 +548,11 @@
1.38
1.39 # Either render the form as a fragment of a page.
1.40
1.41 - if msgtype == "dialog" and self.get_form().get("update-form-only", ["false"])[0] == "true":
1.42 + form = self.get_form()
1.43 + update_form_only = form.get("update-form-only", ["false"])[0] == "true"
1.44 + action_attempted = form.has_key(self.form_trigger)
1.45 +
1.46 + if msgtype == "dialog" and update_form_only and not action_attempted:
1.47 send_headers = get_send_headers(self.request)
1.48 send_headers(["Content-Type: text/html; charset=%s" % config.charset])
1.49 self.request.write(msg.render())
1.50 @@ -591,12 +595,14 @@
1.51
1.52 # Validate certain fields.
1.53
1.54 - try:
1.55 - title = form["title"][0]
1.56 - template = form["template"][0]
1.57 - parent = form["parent"][0]
1.58 - except (KeyError, IndexError):
1.59 - return 0, _("Event title or template missing.")
1.60 + title = form.get("title", [""])[0].strip()
1.61 + template = form.get("template", [""])[0].strip()
1.62 + parent = form.get("parent", [""])[0].strip()
1.63 +
1.64 + if not title:
1.65 + return 0, _("No event title specified.")
1.66 + if not template:
1.67 + return 0, _("No event template specified.")
1.68
1.69 try:
1.70 start_day = self._get_input(form, "start-day")