Ticket #6556: report-6556.diff

Users/eblot/Sources/Svn/edgewall.org/trac/trunk/trac/ticket/report.py

@@ -268 +268 @@
             self._send_sql(req, id, title, description, sql)
 
         if id > 0:
-            title = '{%i} %s' % (id, title)
+            decorated_title = '{%i} %s' % (id, title)
+        else:
+            decorated_title = title
 
         report_resource = Resource('report', id)
         context = Context.from_request(req, report_resource)
-        data = {'action': 'view', 'title': title,
-                'report': {'id': id, 'resource': report_resource},
-                'context': context,
-                'title': title, 'description': description,
+        data = {'action': 'view',
+                'report': {'id': id, 'resource': report_resource, 
+                           'title' : title},
+                'context': context, 'title': decorated_title, 
+                'description': description,
                 'args': args, 'message': None}
         try:
             cols, results = self.execute_report(req, db, id, sql, args)

Users/eblot/Sources/Svn/edgewall.org/trac/trunk/trac/ticket/templates/report.rss

@@ -5 +5 @@
   <xi:include href="macros.rss" />
   <channel>
     <title>$project.name: $report.title</title>
-    <link>${abs_href.report(report.id)}</link>
+    <link>${abs_href.report(report.id != -1 and report.id or '')}</link>
     <description>Trac Report - $report.description</description>
     <language>en-us</language>
     <image py:if="chrome.logo.src">
-      <title>$project.name</title>
-      <url>$chrome.logo.src</url>
+      <title>$project.name: $report.title</title>
+      <url>${
+          chrome.logo.src_abs and chrome.logo.src_abs or abs_href(chrome.logo.src)
+        }</url>
       <link>${abs_href.report(report.id != -1 and report.id or '')}</link>
     </image>
     <generator>Trac v${trac.version}</generator>
@@ -22 +24 @@
             <py:when test="col == 'reporter'">
               ${author_or_creator(cell.author, email_map)}
             </py:when>
-            <py:when test="col in ('time', 'changetime', 'created', 'modified')">
-              <!-- FIXME: we end up with multiple pubDate -->
-              <pubDate py:if="cell.value != 'None'">${http_date(fromtimestamp(int(cell.value)))}</pubDate>
-            </py:when>
             <py:when test="col == 'summary'">
               <title>#$row.id: $cell.value</title>
             </py:when>
@@ -35 +33 @@
           </py:choose>
         </py:with>
       </py:for>
+      <py:with vars="lru = max([int(cell.value) for cell in [c for cell_group in row.cell_groups for c in cell_group] 
+                     if cell.header.col.strip('_') in ('time', 'changetime', 'created', 'modified')])">
+          <pubDate>${http_date(fromtimestamp(lru))}</pubDate>
+      </py:with>
       <link py:if="row.id">${abs_url_of(row.resource)}</link>
       <guid isPermaLink="false" py:if="row.id">${abs_url_of(row.resource)}</guid>
       <category>Report</category>