Changeset 5464 for main

Timestamp:

22 Aug 2010, 14:26:01 (14 years ago)

Author:

uli

Message:

• Remove trash.

• Fix principal-factory/principal interaction.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/jambtables/authentication.py (modified) (3 diffs)

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

@@ -52 +52 @@
     grok.implements(IApplicantPrincipalInfo)
 
-    # def __init__(self, id, title, description):
-    # def __init__(self, reg_no, access_code):
     def __init__(self, access_code, jamb_reg_no=None):
         self.id = principal_id(access_code, jamb_reg_no)
@@ -72 +70 @@
     grok.implements(IApplicantPrincipal)
 
-    def __init__(self, reg_no, access_code):
-        self.id = '%s-%s' % (reg_no, access_code)
+    def __init__(self, access_code, reg_no, prefix=None):
+        self.id = principal_id(access_code, reg_no)
+        if prefix is not None:
+            self.id = '%s.%s' % (prefix, self.id)
         self.title = u'Applicant'
         self.description = u'An applicant'
@@ -100 +100 @@
     def __call__(self, authentication):
         principal = ApplicantPrincipal(
-            authentication.prefix + self.info.reg_no,
-            self.info.access_code
+            self.info.access_code,
+            self.info.reg_no,
+            authentication.prefix,
             )
         notify(