Changeset 7376

Timestamp:

18 Dec 2011, 11:29:58 (13 years ago)

Author:

Henrik Bettermann

Message:

In the base system we don't use access codes (activation codes) anymore. I'd like to leave the respective lines as comments in case we need them in customization packages.

Location:

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

Files:

• __init__.py (modified) (1 diff)
• applicant.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• tests/test_browser.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/__init__.py

@@ -7 +7 @@
     )
 from waeup.sirp.applicants.container import ApplicantsContainer
-from waeup.sirp.applicants.root import (
-    ApplicantsRoot, get_applicant_data, application_exists,
-    )
+from waeup.sirp.applicants.root import ApplicantsRoot
 from waeup.sirp.applicants.dynamicroles import (
     ApplicantPrincipalRoleManager,)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py

@@ -127 +127 @@
     grok.context(IApplicant)
 
-    access_code = index.Field(attribute='access_code')
+    #access_code = index.Field(attribute='access_code')
     applicant_id = index.Field(attribute='applicant_id')
     reg_number = index.Field(attribute='reg_number')

main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

@@ -172 +172 @@
         )
 
-    ac_prefix = schema.Choice(
-        title = u'Access code prefix',
-        required = True,
-        default = None,
-        source = application_pins_vocab,
-        )
+    #ac_prefix = schema.Choice(
+    #    title = u'Activation code prefix',
+    #    required = True,
+    #    default = None,
+    #    source = application_pins_vocab,
+    #    )
 
     application_category = schema.Choice(
@@ -300 +300 @@
         source = contextual_reg_num_source,
         )
-    access_code = schema.TextLine(
-        title = u'Access Code',
-        required = False,
-        readonly = True,
-        )
+    #access_code = schema.TextLine(
+    #    title = u'Activation Code',
+    #    required = False,
+    #    readonly = True,
+    #    )
     firstname = schema.TextLine(
         title = u'First Name',

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_browser.py

@@ -79 +79 @@
         # Add an applicants container
         applicantscontainer = ApplicantsContainer()
-        applicantscontainer.ac_prefix = 'APP'
+        #applicantscontainer.ac_prefix = 'APP'
         applicantscontainer.code = u'app2009'
         applicantscontainer.prefix = 'app'
@@ -243 +243 @@
         self.browser.getControl(name="form.provider").value = [
             'waeup.sirp.applicants.ApplicantsContainer']
-        self.browser.getControl(name="form.ac_prefix").value = ['APP']
+        #self.browser.getControl(name="form.ac_prefix").value = ['APP']
         self.browser.getControl(name="form.application_category").value = ['basic']
         self.browser.getControl("Add applicants container").click()
@@ -255 +255 @@
         self.browser.getControl(name="form.provider").value = [
             'waeup.sirp.applicants.ApplicantsContainer']
-        self.browser.getControl(name="form.ac_prefix").value = ['APP']
+        #self.browser.getControl(name="form.ac_prefix").value = ['APP']
         self.browser.getControl(name="form.application_category").value = ['basic']
         self.browser.getControl("Add applicants container").click()
@@ -269 +269 @@
         self.browser.getControl(name="form.provider").value = [
             'waeup.sirp.applicants.ApplicantsContainer']
-        self.browser.getControl(name="form.ac_prefix").value = ['APP']
+        #self.browser.getControl(name="form.ac_prefix").value = ['APP']
         self.browser.getControl(name="form.application_category").value = ['basic']
         self.browser.getControl("Add applicants container").click()