kinggreedy added the comment:

I've attached the patch regard to this issue

----------
assignedto: kinggreedy -> 

_______________________________________________________
PSF Meta Tracker <metatrac...@psf.upfronthosting.co.za>
<http://psf.upfronthosting.co.za/roundup/meta/issue564>
_______________________________________________________
# HG changeset patch
# User Chau Nguyen <dangchau1...@gmail.com>
# Date 1427564723 -7200
#      Sat Mar 28 19:45:23 2015 +0200
# Branch experiment
# Node ID 6d76e69070af99589d1c931bd393ff0984e80777
# Parent  20786c5152e433832650a4300dd1a603605d6a3e
issue564 from meta tracker

diff --git a/roundup/cgi/actions.py b/roundup/cgi/actions.py
--- a/roundup/cgi/actions.py
+++ b/roundup/cgi/actions.py
@@ -698,6 +698,9 @@
                         "to show up erroneously, please check your email)"))
                 return
 
+            # pull the additional email address if exist
+            uaddress = otks.get(otk, 'uaddress', default=None)
+
             # re-open the database as "admin"
             if self.user != 'admin':
                 self.client.opendb('admin')
@@ -720,8 +723,11 @@
                 return
 
             # user info
-            address = self.db.user.get(uid, 'address')
             name = self.db.user.get(uid, 'username')
+            if uaddress is None:
+                address = self.db.user.get(uid, 'address')
+            else:
+                address = uaddress
 
             # send the email
             tracker_name = self.db.config.TRACKER_NAME
@@ -764,7 +770,7 @@
         otk = ''.join([random.choice(chars) for x in range(32)])
         while otks.exists(otk):
             otk = ''.join([random.choice(chars) for x in range(32)])
-        otks.set(otk, uid=uid)
+        otks.set(otk, uid=uid, uaddress=address)
         self.db.commit()
 
         # send the email
_______________________________________________
Tracker-discuss mailing list
Tracker-discuss@python.org
https://mail.python.org/mailman/listinfo/tracker-discuss

Reply via email to