Changeset 7636

Timestamp:

13 Feb 2012, 09:10:16 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix role assignment when creating an account.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• authentication.py (modified) (1 diff)
• authentication.txt (modified) (2 diffs)
• userscontainer.py (modified) (1 diff)

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

@@ -150 +150 @@
 
     def __init__(self, name, password, title=None, description=None,
-                 email=None, phone=None, user_type=None, roles = []):
+                 email=None, phone=None, roles = []):
         self.name = name
         if title is None:
             title = name
-        #if description is None:
-        #    description = title
         self.title = title
         self.description = description
         self.email = email
         self.phone = phone
-        self.user_type = user_type
         self.setPassword(password)
-        #self.setSiteRolesForPrincipal(roles)
+        self.setSiteRolesForPrincipal(roles)
         # We don't want to share this dict with other accounts
         self._local_roles = dict()

main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt

@@ -37 +37 @@
 
   >>> from waeup.sirp.authentication import Account
-  >>> alice = Account('alice', 'alicesecret')
+  >>> alice = Account('alice', 'alicesecret',roles=['waeup.ManageDataCenter'])
   >>> root['app']['users'].addAccount(alice)
 
@@ -51 +51 @@
   {'waeup.local.Owner': [<waeup.sirp.authentication.Account object at 0x...>]}
 
-Users have also got the global AcademicsOfficer role:
+User  automatically get the global AcademicsOfficer role:
 
   >>> alice.getSiteRolesForPrincipal()
-  ['waeup.AcademicsOfficer']
+  ['waeup.ManageDataCenter', 'waeup.AcademicsOfficer']
 
 We can tell an account, that Alice got some role for another object:

main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.py

@@ -39 +39 @@
         #if description is None:
         #    description = title
-        self[name] = Account(name, password, title, description,
-                             email, phone, roles)
+        self[name] = Account(name=name, password=password, title=title,
+                             description=description,
+                             email=email, phone=phone, roles=roles)
 
     def addAccount(self, account):