Rev 212: Added status_text. in http://bzr.daniel-watkins.co.uk/pqm/rss

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/rss

------------------------------------------------------------
revno: 212
revision-id: daniel at daniel-watkins.co.uk-20080710150333-jlbn1stcin8jp2he
parent: daniel at daniel-watkins.co.uk-20080710145315-o8pvt1pnvsffyjvl
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: rss
timestamp: Thu 2008-07-10 16:03:33 +0100
message:
  Added status_text.
-------------- next part --------------
=== modified file 'pqm/ui/template.py'
--- a/pqm/ui/template.py	2008-07-10 14:53:15 +0000
+++ b/pqm/ui/template.py	2008-07-10 15:03:33 +0000
@@ -67,7 +67,7 @@
     <item tal:repeat="message messages">
       <title><tal:block tal:condition="repeat/message/start">Now Playing: </tal:block><div tal:replace="message/subject" /></title>
       <author tal:content="message/sender"></author>
-      <description><div tal:repeat="command message/commands" tal:replace="command" /></description>
+      <description><div tal:repeat="command message/commands" tal:replace="command" /><tal:block tal:condition="repeat/message/start">\n<div tal:replace="status_text" /></tal:block></description>
       <pubDate tal:content="message/submission_time"></pubDate>
     </item>
   </channel>

=== modified file 'pqm/ui/tests/test_twisted.py'
--- a/pqm/ui/tests/test_twisted.py	2008-07-10 14:53:15 +0000
+++ b/pqm/ui/tests/test_twisted.py	2008-07-10 15:03:33 +0000
@@ -207,7 +207,7 @@
                     '    <item>\n'
                     '      <title>Now Playing: A new action</title>\n'
                     '      <author>John.Citizen at example.com</author>\n'
-                    '      <description>Merge archive at example.com/foo--bar--0 archive2 at example.com/bar--foo--1</description>\n'
+                    '      <description>Merge archive at example.com/foo--bar--0 archive2 at example.com/bar--foo--1\n&lt;foo\nbar\nbaz\nquux\ntheta\n</description>\n'
                     '      <pubDate>...</pubDate>\n'
                     '    </item>'
                     '<item>\n'

=== modified file 'pqm/ui/twistd.py'
--- a/pqm/ui/twistd.py	2008-07-10 14:27:40 +0000
+++ b/pqm/ui/twistd.py	2008-07-10 15:03:33 +0000
@@ -75,6 +75,7 @@
         c = Context()
         c.addGlobal('messages', [self.getMessageDict(selected_project, m)
                                     for m in self.queue.messages])
+        c.addGlobal('status_text', self.queue.status_text)
         text = StringIO()
         template.expand(c, text)
         return static.Data(text.getvalue(), 'application/xml')