Changeset 8858 for main/waeup.kofa/trunk/src/waeup/kofa/mandates

Timestamp:

30 Jun 2012, 07:39:07 (12 years ago)

Author:

Henrik Bettermann

Message:

Store user in mandate. This makes everything much easier.

Location:

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

Files:

• mandate.py (modified) (1 diff)
• tests.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/mandates/mandate.py

@@ -55 +55 @@
 
     def _setPassword(self):
-        user_id = self.params.get('user_id', None)
+        user = self.params.get('user', None)
         pwd = self.params.get('password', None)
-        user_type = self.params.get('user_type', None)
-        user = None
-        if user_type == 'student':
-            user = grok.getSite()['students'].get(user_id, None)
-        elif user_type == 'officer':
-            user = grok.getSite()['users'].get(user_id, None)
         if user and pwd:
-            IUserAccount(user).setPassword(pwd)
-            return True
+            try:
+                IUserAccount(user).setPassword(pwd)
+                return True
+            except:
+                return False
         return False
 

main/waeup.kofa/trunk/src/waeup/kofa/mandates/tests.py

@@ -99 +99 @@
         # Add and execute a perfect mandate
         mandate = PasswordMandate()
-        mandate.params['user_id'] = student.student_id
+        mandate.params['user'] = student
         mandate.params['password'] = 'mypwd1'
-        mandate.params['user_type'] = 'student'
         self.app['mandates'].addMandate(mandate)
         msg = mandate.execute()
@@ -115 +114 @@
         officer = self.app['users']['bob']
         mandate = PasswordMandate()
-        mandate.params['user_id'] = 'bob'
+        mandate.params['user'] = officer
         mandate.params['password'] = 'mypwd1'
-        mandate.params['user_type'] = 'officer'
         self.app['mandates'].addMandate(mandate)
         msg = mandate.execute()
@@ -142 +140 @@
         self.app['students'].addStudent(student)
         mandate = PasswordMandate()
-        mandate.params['user_id'] = student.student_id
-        mandate.params['user_type'] = 'student'
+        mandate.params['user'] = student
         mandate.params['password'] = 'mypwd1'
         self.app['mandates'].addMandate(mandate)