1.1 --- a/EventAggregatorSupport.py Wed Feb 03 20:54:14 2010 +0100
1.2 +++ b/EventAggregatorSupport.py Thu Feb 04 00:24:01 2010 +0100
1.3 @@ -500,7 +500,7 @@
1.4
1.5 title = self.page.getPageName()
1.6
1.7 - if event_parent is not None and title.startswith(event_parent):
1.8 + if event_parent and title.startswith(event_parent):
1.9 title = title[len(event_parent.rstrip("/")) + 1:]
1.10
1.11 return getPrettyTitle(title)
2.1 --- a/actions/EventAggregatorSummary.py Wed Feb 03 20:54:14 2010 +0100
2.2 +++ b/actions/EventAggregatorSummary.py Thu Feb 04 00:24:01 2010 +0100
2.3 @@ -29,6 +29,7 @@
2.4 def get_form_html(self, buttons_html):
2.5 _ = self._
2.6 request = self.request
2.7 + form = request.form
2.8
2.9 category_list = []
2.10
2.11 @@ -57,18 +58,20 @@
2.12 ]
2.13
2.14 d = {
2.15 - "buttons_html" : buttons_html,
2.16 - "category_label" : _("Categories"),
2.17 - "category_list" : "\n".join(category_list),
2.18 - "month_list" : "\n".join(month_list),
2.19 - "start_label" : _("Start year and month"),
2.20 - "start_year_default" : "",
2.21 - "end_label" : _("End year and month"),
2.22 - "end_year_default" : "",
2.23 - "descriptions_label" : _("Use descriptions from..."),
2.24 - "descriptions_list" : "\n".join(descriptions_list),
2.25 - "format_label" : _("Summary format"),
2.26 - "format_list" : "\n".join(format_list),
2.27 + "buttons_html" : buttons_html,
2.28 + "category_label" : _("Categories"),
2.29 + "category_list" : "\n".join(category_list),
2.30 + "month_list" : "\n".join(month_list),
2.31 + "start_label" : _("Start year and month"),
2.32 + "start_year_default" : "",
2.33 + "end_label" : _("End year and month"),
2.34 + "end_year_default" : "",
2.35 + "descriptions_label" : _("Use descriptions from..."),
2.36 + "descriptions_list" : "\n".join(descriptions_list),
2.37 + "format_label" : _("Summary format"),
2.38 + "format_list" : "\n".join(format_list),
2.39 + "parent_label" : _("Parent page"),
2.40 + "parent_name" : form.get("parent", [""])[0],
2.41 }
2.42
2.43 return '''
2.44 @@ -116,6 +119,12 @@
2.45 </td>
2.46 </tr>
2.47 <tr>
2.48 + <td class="label"><label>%(parent_label)s</label></td>
2.49 + <td class="content">
2.50 + <input name="parent" type="text" size="40" value="%(parent_name)s" />
2.51 + </td>
2.52 + </tr>
2.53 + <tr>
2.54 <td></td>
2.55 <td class="buttons">
2.56 %(buttons_html)s
2.57 @@ -172,6 +181,7 @@
2.58 category_names = form.get("category", [])
2.59 format = form.get("format", ["iCalendar"])[0]
2.60 descriptions = form.get("descriptions", ["page"])[0]
2.61 + parent = form.get("parent", [""])[0]
2.62
2.63 # Otherwise, produce an iCalendar resource.
2.64
2.65 @@ -225,7 +235,7 @@
2.66
2.67 # Get the summary details.
2.68
2.69 - event_summary = event.getSummary()
2.70 + event_summary = event.getSummary(parent)
2.71 link = event_page.getPageURL(request)
2.72
2.73 # Output the event details.
2.74 @@ -281,7 +291,7 @@
2.75
2.76 # Get the summary details.
2.77
2.78 - event_summary = event.getSummary()
2.79 + event_summary = event.getSummary(parent)
2.80 link = event_page.getPageURL(request)
2.81
2.82 request.write('<item>\r\n')
3.1 --- a/macros/EventAggregator.py Wed Feb 03 20:54:14 2010 +0100
3.2 +++ b/macros/EventAggregator.py Thu Feb 04 00:24:01 2010 +0100
3.3 @@ -93,7 +93,9 @@
3.4
3.5 # Generate the links.
3.6
3.7 - download_all_link = "action=EventAggregatorSummary&doit=1&%s" % self.category_name_parameters
3.8 + download_all_link = "action=EventAggregatorSummary&doit=1&parent=%s&%s" % (
3.9 + self.parent_name or "", self.category_name_parameters
3.10 + )
3.11 download_link = download_all_link + ("&%s&%s" % (
3.12 self.getMonthQueryString("start", self.calendar_start, prefix=0),
3.13 self.getMonthQueryString("end", self.calendar_end, prefix=0)