[silva.pas.base][Sylvain Viollon] Configure things in SMI too.

author:    Sylvain Viollon
date:      Fri Oct 25 15:57:46 2013 +0200
revision:  256:995cadd3dd5e in silva.pas.base
branch:    2.4
details:   https://hg.infrae.com/silva.pas.base?cmd=changeset;node=995cadd3dd5e
modified:  src/silva/pas/base/Membership.py src/silva/pas/base/interfaces.py src/silva/pas/base/tests/test_service.py
added:     
removed:   
log:       Configure things in SMI too.


diffstat:

 src/silva/pas/base/Membership.py         |  20 ++++++++++++++++----
 src/silva/pas/base/interfaces.py         |   7 ++++---
 src/silva/pas/base/tests/test_service.py |   4 ++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diffs (91 lines):

diff -r 12e457178918 -r 995cadd3dd5e src/silva/pas/base/Membership.py
--- a/src/silva/pas/base/Membership.py	Fri Aug 30 19:32:14 2013 +0200
+++ b/src/silva/pas/base/Membership.py	Fri Oct 25 15:57:46 2013 +0200
@@ -34,7 +34,6 @@
 from silva.translations import translate as _
 
 from zeam.form import silva as silvaforms
-from zeam.form.ztk.actions import EditAction
 
 
 class Group(object):
@@ -57,7 +56,7 @@
 class MemberService(SimpleMemberService):
     """Silva Member Service who delagates members search to PAS.
     """
-    meta_type = 'Silva Pluggable Auth Service Member Service'
+    meta_type = 'Silva Pluggable Authentication Service'
     grok.implements(IPASService)
     grok.name('service_members')
     silvaconf.default_service()
@@ -278,11 +277,11 @@
 
     ignoreContent = False
 
-    label = _(u'Manage Member service')
+    label = _(u'Authentication configuration')
     description = _(u'Configure various settings related to user '
                     u'sessions and permissions.')
     fields = silvaforms.Fields(ISettingsFields)
-    actions = silvaforms.Actions(EditAction(_('Save changes')))
+    actions = silvaforms.Actions(silvaforms.EditAction())
 
     @silvaforms.action(_(u"Install PAS"),
                        available=lambda f: f.context._get_pas() is None)
@@ -291,3 +290,16 @@
         if 'acl_users' in root.objectIds():
             root.manage_delObjects(['acl_users'])
         create_acl_users(root)
+
+
+class MemberServiceConfiguration(silvaforms.ConfigurationForm):
+    grok.context(MemberService)
+    grok.name('admin')
+
+    label = _(u'Authentication configuration')
+    description = _(u'Configure various settings related to user '
+                    u'sessions and permissions.')
+    fields = silvaforms.Fields(ISettingsFields)
+    actions = silvaforms.Actions(
+        silvaforms.CancelAction(),
+        silvaforms.EditAction())
diff -r 12e457178918 -r 995cadd3dd5e src/silva/pas/base/interfaces.py
--- a/src/silva/pas/base/interfaces.py	Fri Aug 30 19:32:14 2013 +0200
+++ b/src/silva/pas/base/interfaces.py	Fri Oct 25 15:57:46 2013 +0200
@@ -2,12 +2,13 @@
 # Copyright (c) 2008-2013 Infrae. All rights reserved.
 # See also LICENSE.txt
 
+from silva.core.interfaces import ISilvaConfigurableService
+from silva.core.services.interfaces import IMemberService, IGroupService
 from zope.interface import Interface
-from silva.core.services.interfaces import IMemberService, IGroupService
 
 
-class IPASService(IMemberService, IGroupService):
-    """Mark PAS Service Membership.
+class IPASService(IMemberService, IGroupService, ISilvaConfigurableService):
+    """PAS Service Membership.
     """
 
 
diff -r 12e457178918 -r 995cadd3dd5e src/silva/pas/base/tests/test_service.py
--- a/src/silva/pas/base/tests/test_service.py	Fri Aug 30 19:32:14 2013 +0200
+++ b/src/silva/pas/base/tests/test_service.py	Fri Oct 25 15:57:46 2013 +0200
@@ -39,14 +39,14 @@
         self.assertEqual(service, self.root.service_members)
         self.assertEqual(
             service.meta_type,
-            "Silva Pluggable Auth Service Member Service")
+            "Silva Pluggable Authentication Service")
         self.assertEqual(service, self.root.service_members)
         self.assertTrue(verifyObject(interfaces.IMemberService, service))
 
         service = queryUtility(interfaces.IGroupService)
         self.assertEqual(
             service.meta_type,
-            "Silva Pluggable Auth Service Member Service")
+            "Silva Pluggable Authentication Service")
         self.assertEqual(service, self.root.service_members)
         #self.assertTrue(verifyObject(interfaces.IGroupService, service))