Mercurial > p > roundup > code
comparison roundup/cgi/actions.py @ 3467:8fcee705ebdb maint-0.8
merge from HEAD
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Fri, 13 Jan 2006 03:34:34 +0000 |
| parents | e012231982e9 |
| children | 235f1cee5cf2 |
comparison
equal
deleted
inserted
replaced
| 3462:639a3d1014e9 | 3467:8fcee705ebdb |
|---|---|
| 1 #$Id: actions.py,v 1.40.2.8 2005-07-07 06:44:35 richard Exp $ | 1 #$Id: actions.py,v 1.40.2.9 2006-01-13 03:34:34 richard Exp $ |
| 2 | 2 |
| 3 import re, cgi, StringIO, urllib, Cookie, time, random, csv | 3 import re, cgi, StringIO, urllib, Cookie, time, random, csv |
| 4 | 4 |
| 5 from roundup import hyperdb, token, date, password | 5 from roundup import hyperdb, token, date, password |
| 6 from roundup.i18n import _ | 6 from roundup.i18n import _ |
| 786 # commit now that all the tricky stuff is done | 786 # commit now that all the tricky stuff is done |
| 787 self.db.commit() | 787 self.db.commit() |
| 788 | 788 |
| 789 # finish off by logging the user in | 789 # finish off by logging the user in |
| 790 self.userid = self.nodeid | 790 self.userid = self.nodeid |
| 791 self.finishRego() | 791 return self.finishRego() |
| 792 return | |
| 793 | 792 |
| 794 # generate the one-time-key and store the props for later | 793 # generate the one-time-key and store the props for later |
| 795 for propname, proptype in self.db.user.getprops().items(): | 794 for propname, proptype in self.db.user.getprops().items(): |
| 796 value = user_props.get(propname, None) | 795 value = user_props.get(propname, None) |
| 797 if value is None: | 796 if value is None: |