[silva.core.smi][Sylvain Viollon] Change the criteria used to li...

author:    Sylvain Viollon
date:      Fri Oct 25 15:56:18 2013 +0200
revision:  705:96a96dbecd34 in silva.core.smi
branch:    2.4
details:   https://hg.infrae.com/silva.core.smi?cmd=changeset;node=96a96dbecd34
modified:  src/silva/core/smi/admin.py
added:     
removed:   
log:       Change the criteria used to list services.


diffstat:

 src/silva/core/smi/admin.py |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r 8e6ba8e6a4b8 -r 96a96dbecd34 src/silva/core/smi/admin.py
--- a/src/silva/core/smi/admin.py	Tue Oct 22 17:31:16 2013 +0200
+++ b/src/silva/core/smi/admin.py	Fri Oct 25 15:56:18 2013 +0200
@@ -4,7 +4,7 @@
 from five import grok
 from silva.core.interfaces import IContainer, IRoot
 from silva.core.interfaces import IIconResolver, ISiteManager
-from silva.core.interfaces import ISilvaService, ISilvaInvisibleService
+from silva.core.interfaces import ISilvaConfigurableService
 from silva.translations import translate as _
 from silva.ui import rest
 from silva.ui.menu import MenuItem
@@ -23,13 +23,12 @@
     def get_services(self, container):
         services = []
         for candidate in container.objectValues():
-            if ISilvaService.providedBy(candidate):
-                if not ISilvaInvisibleService.providedBy(candidate):
-                    # We assume service icons are URLs
-                    services.append({
-                            'name': candidate.meta_type,
-                            'icon': self.get_icon(candidate),
-                            'path': self.get_content_path(candidate)})
+            if ISilvaConfigurableService.providedBy(candidate):
+                # We assume service icons are URLs
+                services.append({
+                        'name': candidate.meta_type,
+                        'icon': self.get_icon(candidate),
+                        'path': self.get_content_path(candidate)})
         return sorted(services, key=lambda i: i['name'].lower())
 
     def update(self):