Changeset 9312

Timestamp:

8 Oct 2012, 07:54:23 (12 years ago)

Author:

Henrik Bettermann

Message:

Import roles correctly.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• authentication.py (modified) (2 diffs)
• browser/batchprocessing.txt (modified) (2 diffs)
• hostels/batching.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/authentication.py

@@ -37 +37 @@
     IUserAccount, IAuthPluginUtility, IPasswordValidator,
     IKofaPrincipal, IKofaPrincipalInfo, IKofaPluggable,
-    IBatchProcessor)
+    IBatchProcessor, IGNORE_MARKER)
 from waeup.kofa.utils.batching import BatchProcessor
 
@@ -420 +420 @@
         return
 
+    def updateEntry(self, obj, row, site):
+        """Update obj to the values given in row.
+        """
+        changed = []
+        for key, value in row.items():
+            if  key == 'roles':
+                # We cannot simply set the roles attribute here because
+                # we can't assure that the name attribute is set before
+                # the roles attribute is set.
+                continue
+            # Skip fields to be ignored.
+            if value == IGNORE_MARKER:
+                continue
+            if not hasattr(obj, key):
+                continue
+            setattr(obj, key, value)
+            changed.append('%s=%s' % (key, value))
+        roles = row.get('roles', IGNORE_MARKER)
+        if roles not in ('', IGNORE_MARKER):
+            evalvalue = eval(roles)
+            if isinstance(evalvalue, list):
+                setattr(obj, 'roles', evalvalue)
+                changed.append('roles=%s' % roles)
+        # Log actions...
+        items_changed = ', '.join(changed)
+        grok.getSite().logger.info('%s - %s - User updated: %s'
+            % (self.name, row['name'], items_changed))
+        return
 
 class UsersPlugin(grok.GlobalUtility):

main/waeup.kofa/trunk/src/waeup/kofa/browser/batchprocessing.txt

@@ -23 +23 @@
     >>> from waeup.kofa.app import University
     >>> getRootFolder()['app'] = University()
+    >>> from zope.component.hooks import setSite
+    >>> setSite(getRootFolder()['app'])
 
 Create a datacenter storage path:
@@ -493 +495 @@
    >>> henrik = getRootFolder()['app']['users']['henrik']
    >>> henrik.roles
-   ['waeup.PortalManager', 'waeup.ImportManager']
+   ['waeup.PortalManager', 'waeup.AcademicsOfficer', 'waeup.ImportManager']
 
 Pending files

main/waeup.kofa/trunk/src/waeup/kofa/hostels/batching.py

@@ -75 +75 @@
                 evalvalue = eval(value)
                 if isinstance(evalvalue, list):
-                    value = eval(value)
+                    value = evalvalue
             except:
                 pass