When creating CAS plugin, load values from registry. This handles the…

… use case of when the CAS plugin is being re-created.

src/collective/castle/control_panel.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from StringIO import StringIO
 
-from zope.component import adapter
+from zope.component import adapter, getUtility
 from zope.schema import getFields
 from zope.app.component.hooks import getSite
 
@@ -10,7 +10,9 @@
 from Products.statusmessages.interfaces import IStatusMessage
 
 from plone.app.registry.browser import controlpanel
-from plone.registry.interfaces import IRecordModifiedEvent
+from plone.registry.interfaces import IRecordModifiedEvent, IRegistry
+
+from Products.CAS4PAS.CASAuthHelper import CASAuthHelper
 
 from collective.castle.interfaces import ICAS4PASPluginSchema
 
@@ -25,10 +27,17 @@ def updateCASSettings(settings, event):
         cas4pas.addCASAuthHelper('cas', 'CAS Auth Helper')
         cas = acl_users['cas']
 
+        registry = getUtility(IRegistry)
+        casSettings = registry.forInterface(ICAS4PASPluginSchema)
+
         #Load defaults from fields
         fields = getFields(ICAS4PASPluginSchema)
         for field in fields:
-            setattr(cas, field, fields[field].default)
+            #Only set attributes the PAS plugin knows about
+            if hasattr(CASAuthHelper, field):
+                #Set from registry settings, which will pick up defaults
+                value = getattr(casSettings, field)
+                setattr(cas, field, value)
 
         out = StringIO()
         activatePluginInterfaces(portal, 'cas', out)
@@ -37,8 +46,10 @@ def updateCASSettings(settings, event):
     else:
         cas = cas_auth_helpers[0]
 
-    #Proxy the changed value to the CAS4PAS helper
-    setattr(cas, event.record.fieldName, event.newValue)
+    fieldName = event.record.fieldName
+    if hasattr(CASAuthHelper, fieldName):
+        #Proxy the changed value to the CAS4PAS helper if applicable
+        setattr(cas, fieldName, event.newValue)
 
 class CASSettingsEditForm(controlpanel.RegistryEditForm):