Changeset 16215 for main

Timestamp:

27 Aug 2020, 06:24:17 (4 years ago)

Author:

Henrik Bettermann

Message:

Use email address as identifier for reports. Names can be changed by referees but email addresses must not be changed.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• tests/test_browser.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -1796 +1796 @@
             report_exists = False
             for report in self.context.refereereports:
-                if report.name == referee.name:
+                if report.email == referee.email:
                     report_exists = True
             if report_exists:
@@ -1920 +1920 @@
             # (2) Report exists but was created with another mandate.
             for report in self.context.refereereports:
-                if report.name == mandate.params.get('name'):
+                if report.email == mandate.params.get('email'):
                     self.flash(_('You have already created a '
                                  'report with another mandate.'),

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

@@ -685 +685 @@
     email = schema.ASCIILine(
         title = _(u'Referee Email Address'),
-        required = True,
-        constraint=validate_email,
+        #required = True,
+        #constraint=validate_email,
+        readonly = True,
         )
 

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

@@ -1740 +1740 @@
             % mandate.mandate_id)
         self.assertTrue('Joan None' in self.browser.contents)
+        self.assertTrue('John Referee' in self.browser.contents)
         # Report can't be saved without required fields
-        self.browser.getControl(name="form.email").value = ''
+        self.browser.getControl(name="form.name").value = ''
         self.browser.getControl("Submit").click()
         self.assertTrue('Required input is missing' in self.browser.contents)
-        self.browser.getControl(name="form.email").value = 'bb@bb.bb'
+        self.browser.getControl(name="form.name").value = 'Johnny Referee'
         self.browser.getControl("Submit").click()
         # Referee will be redirected to the frontpage
@@ -1789 +1790 @@
         self.assertEqual(
             self.browser.url, self.view_path  + '/%s' % report.r_id)
-        self.assertTrue('John Referee' in self.browser.contents)
+        self.assertTrue('Johnny Referee' in self.browser.contents)
         # Managers can download a pdf slip
         self.browser.getLink("Download referee report").click()
@@ -2031 +2032 @@
         report = createObject(u'waeup.ApplicantRefereeReport')
         report.r_id = 'any_id'
-        report.name = u'Linda Tree'
+        report.name = u'Liiiinda Tree'
+        report.email = 'linda@forest.de'
         self.applicant[report.r_id] = report
         self.browser.open(self.manage_path)