[Checkins] SVN: grok/trunk/grokwiki/s grokwiki was broken with newer version of grokui.admin as it depended

Martijn Faassen faassen at startifact.com
Tue May 18 16:12:27 EDT 2010


Log message for revision 112488:
  grokwiki was broken with newer version of grokui.admin as it depended
  on a view 'messages' defined in grokui.admin that was now gone. grokwiki
  should never have depended on grokui.admin's views anyway, I think..
  
  

Changed:
  U   grok/trunk/grokwiki/setup.py
  U   grok/trunk/grokwiki/src/grokwiki/page.py
  A   grok/trunk/grokwiki/src/grokwiki/page_templates/messages.pt

-=-
Modified: grok/trunk/grokwiki/setup.py
===================================================================
--- grok/trunk/grokwiki/setup.py	2010-05-18 19:50:28 UTC (rev 112487)
+++ grok/trunk/grokwiki/setup.py	2010-05-18 20:12:27 UTC (rev 112488)
@@ -19,6 +19,7 @@
                       'grok',
                       'grokui.admin',
                       'grokcore.startup',
+                      'grokcore.message',
                       ],
     entry_points = """
       [console_scripts]

Modified: grok/trunk/grokwiki/src/grokwiki/page.py
===================================================================
--- grok/trunk/grokwiki/src/grokwiki/page.py	2010-05-18 19:50:28 UTC (rev 112487)
+++ grok/trunk/grokwiki/src/grokwiki/page.py	2010-05-18 20:12:27 UTC (rev 112488)
@@ -16,6 +16,8 @@
 import re
 import grok
 
+from z3c.flashmessage.interfaces import IMessageReceiver
+from zope import component
 
 LINK_PATTERN = re.compile('\[\[(.*?)\]\]')
 find_wiki_links = LINK_PATTERN.findall
@@ -58,6 +60,11 @@
         self.flash('Saved.')
         self.redirect(self.url(self.context))
 
+class Messages(grok.View):
+    @property
+    def messages(self):
+        receiver = component.getUtility(IMessageReceiver)
+        return receiver.receive()
 
 class WikiLayer(grok.IRESTLayer):
     # This skin will be visible as http://localhost:8080/++rest++wiki/...

Added: grok/trunk/grokwiki/src/grokwiki/page_templates/messages.pt
===================================================================
--- grok/trunk/grokwiki/src/grokwiki/page_templates/messages.pt	                        (rev 0)
+++ grok/trunk/grokwiki/src/grokwiki/page_templates/messages.pt	2010-05-18 20:12:27 UTC (rev 112488)
@@ -0,0 +1,7 @@
+<ul>
+  <li
+    tal:repeat="message view/messages"
+    tal:attributes="class message/type"
+    tal:content="message/message">Sauron will arrive soon!
+  </li>
+</ul>



More information about the checkins mailing list