[Checkins] SVN: grokui.admin/trunk/s now using the latest megrok.layout

Souheil CHELFOUH souheil at chelfouh.com
Fri Feb 26 06:52:23 EST 2010


Log message for revision 109458:
  now using the latest megrok.layout
  

Changed:
  U   grokui.admin/trunk/setup.py
  U   grokui.admin/trunk/src/grokui/admin/configure.zcml
  U   grokui.admin/trunk/src/grokui/admin/security.py
  U   grokui.admin/trunk/src/grokui/admin/views.py

-=-
Modified: grokui.admin/trunk/setup.py
===================================================================
--- grokui.admin/trunk/setup.py	2010-02-26 11:46:05 UTC (rev 109457)
+++ grokui.admin/trunk/setup.py	2010-02-26 11:52:23 UTC (rev 109458)
@@ -44,7 +44,7 @@
           'ZODB3',
           'grok',
           'grokui.base',
-          'megrok.layout',
+          'megrok.layout >= 1.0.1',
           'setuptools',
           'z3c.flashmessage',
           'zope.applicationcontrol',

Modified: grokui.admin/trunk/src/grokui/admin/configure.zcml
===================================================================
--- grokui.admin/trunk/src/grokui/admin/configure.zcml	2010-02-26 11:46:05 UTC (rev 109457)
+++ grokui.admin/trunk/src/grokui/admin/configure.zcml	2010-02-26 11:52:23 UTC (rev 109458)
@@ -1,6 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:grok="http://namespaces.zope.org/grok">
   <include package="grok" />
+  <include package="grokui.base" />
   <include package="zope.applicationcontrol" />
   <include package="zope.login" />
   <grok:grok package="." />

Modified: grokui.admin/trunk/src/grokui/admin/security.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/security.py	2010-02-26 11:46:05 UTC (rev 109457)
+++ grokui.admin/trunk/src/grokui/admin/security.py	2010-02-26 11:52:23 UTC (rev 109458)
@@ -38,7 +38,7 @@
         notifier = self.security_notifier
         if notifier is None:
             return u""
-        return '''<div class="grokui-security message">%s</div>''' % (
+        return u'''<div class="grokui-security message">%s</div>''' % (
             self.security_notifier.getNotification())
 
 

Modified: grokui.admin/trunk/src/grokui/admin/views.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/views.py	2010-02-26 11:46:05 UTC (rev 109457)
+++ grokui.admin/trunk/src/grokui/admin/views.py	2010-02-26 11:52:23 UTC (rev 109458)
@@ -2,8 +2,6 @@
 """Views for the grok admin UI"""
 
 import grok
-import z3c.flashmessage.interfaces
-
 from BTrees.OOBTree import OOBTree
 from grokui.base import IGrokUIRealm
 from grokui.admin.interfaces import ISecurityNotifier
@@ -153,10 +151,6 @@
     grok.template('rename')
     grok.require('grok.ManageApplications')
 
-    def flash(self, message, type='message'):
-        source = getUtility(
-            z3c.flashmessage.interfaces.IMessageSource, name='session')
-        source.send(message, type)
 
     def update(self, cancel=None, items=None, new_names=None):
 



More information about the checkins mailing list