Changeset 8757 for main

Timestamp:

19 Jun 2012, 07:28:08 (13 years ago)

Author:

Henrik Bettermann

Message:

Add public_name to IKofaPrincipalInfo and IKofaPrincipal.

Location:

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

Files:

• authentication.py (modified) (8 diffs)
• interfaces.py (modified) (2 diffs)
• students/authentication.py (modified) (1 diff)
• userscontainer.py (modified) (2 diffs)

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

@@ -77 +77 @@
 
     A Kofa principal info is created with id, login, title, description,
-    phone, email and user_type.
+    phone, email, public_name and user_type.
     """
     grok.implements(IKofaPrincipalInfo)
 
-    def __init__(self, id, title, description, email, phone, user_type):
+    def __init__(self, id, title, description, email, phone, public_name, user_type):
         self.id = id
         self.title = title
@@ -87 +87 @@
         self.email = email
         self.phone = phone
+        self.public_name = public_name
         self.user_type = user_type
         self.credentialsPlugin = None
@@ -94 +95 @@
     """A portal principal.
 
-    Kofa principals provide an extra `email`, `phone` and `user_type`
+    Kofa principals provide an extra `email`, `phone`, `public_name` and `user_type`
     attribute extending ordinary principals.
     """
@@ -101 +102 @@
 
     def __init__(self, id, title=u'', description=u'', email=u'',
-                 phone=None, user_type=u'', prefix=None):
+                 phone=None, public_name=u'', user_type=u'', prefix=None):
         self.id = id
         if prefix is not None:
@@ -110 +111 @@
         self.email = email
         self.phone = phone
+        self.public_name = public_name
         self.user_type = user_type
 
@@ -137 +139 @@
             self.info.email,
             self.info.phone,
+            self.info.public_name,
             self.info.user_type,
             authentication.prefix,
@@ -237 +240 @@
             email=account.email,
             phone=account.phone,
+            public_name=account.public_name,
             user_type=u'user')
 
@@ -249 +253 @@
             email=account.email,
             phone=account.phone,
+            public_name=account.public_name,
             user_type=u'user')
 

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

@@ -392 +392 @@
     email = Attribute("The email address of a user")
     phone = Attribute("The phone number of a user")
+    public_name = Attribute("The public name of a user")
 
 
@@ -410 +411 @@
         description = u'',
         required=False,)
+
+    public_name = schema.TextLine(
+        title = _(u'Public Name'),
+        required = False,)
 
 class IUserAccount(IKofaObject):

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

@@ -140 +140 @@
                              email=account.email,
                              phone=account.phone,
+                             public_name=account.public_name,
                              user_type=account.user_type)
 

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

@@ -33 +33 @@
 
     def addUser(self, name, password, title=None,
-                description=None, email=None, phone=None, roles=[]):
+                description=None, email=None, phone=None,
+                public_name= None, roles=[]):
         """Add a new Account instance, created from parameters.
         """
@@ -41 +42 @@
         #    description = title
         self[name] = Account(name=name, password=password, title=title,
-                             description=description,
+                             description=description, public_name=public_name,
                              email=email, phone=phone, roles=roles)
         #self.logger.info('User account %s added.' % name)