[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/ - made views work without skins tool

[Yvo Schubbe]

Log message for revision 126983:
  - made views work without skins tool

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py	2012-06-21 09:56:54 UTC (rev 126982)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py	2012-06-21 12:54:21 UTC (rev 126983)
@@ -223,8 +223,8 @@
     # helpers
 
     def _set_skin_cookie(self):
-        stool = getUtility(ISkinsTool)
-        if stool.updateSkinCookie():
+        stool = queryUtility(ISkinsTool)
+        if stool is not None and stool.updateSkinCookie():
             skinname = self.context.getSkinNameFromRequest(self.request)
             self.context.changeSkin(skinname, self.request)
 
@@ -318,8 +318,9 @@
 
     def _clear_skin_cookie(self):
         """Remove skin cookie"""
-        stool = getUtility(ISkinsTool)
-        stool.clearSkinCookie()
+        stool = queryUtility(ISkinsTool)
+        if stool is not None:
+            stool.clearSkinCookie()
 
     # interface
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py	2012-06-21 09:56:54 UTC (rev 126982)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/preferences.py	2012-06-21 12:54:21 UTC (rev 126983)
@@ -15,6 +15,7 @@
 
 from zope.component import adapts
 from zope.component import getUtility
+from zope.component import queryUtility
 from zope.formlib import form
 from zope.interface import implements
 from zope.interface import Interface
@@ -34,7 +35,9 @@
 
 
 def portal_skins(context):
-    stool = getUtility(ISkinsTool)
+    stool = queryUtility(ISkinsTool)
+    if stool is None:
+        return SimpleVocabulary(())
     return SimpleVocabulary.fromValues(stool.getSkinSelections())
 
 
@@ -123,8 +126,9 @@
     def applyChanges(self, data):
         changes = super(PreferencesFormView, self).applyChanges(data)
         if any('portal_skin' in v for v in changes.itervalues()):
-            stool = getUtility(ISkinsTool)
-            stool.updateSkinCookie()
+            stool = queryUtility(ISkinsTool)
+            if stool is not None:
+                stool.updateSkinCookie()
         return changes
 
     def handle_change_success(self, action, data):