merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -7,6 +7,7 @@ Fixed:
 - roundup-server -g option not recognised (sf bug 952310)
 - HTML templating isset() inverted (sf bug 951779)
 - otks manager missing (sf bug 952931)
+- mention DEFAULT_TIMEZONE requirement in upgrading doc (sf bug 952932)
 
 
 2004-05-07 0.7.1

doc/upgrading.txt

@@ -13,6 +13,20 @@ steps.
 
 .. contents::
 
+Migrating from 0.7.0 to 0.7.2
+=============================
+
+0.7.2 DEFAULT_TIMEZONE is now required
+--------------------------------------
+
+The DEFAULT_TIMEZONE configuration variable is now required. Add the
+following to your tracker's ``config.py`` file::
+
+    # You may specify a different default timezone, for use when users do not
+    # choose their own in their settings.
+    DEFAULT_TIMEZONE = 0            # specify as numeric hour offest
+
+
 Migrating from 0.7.0 to 0.7.1
 =============================
 

roundup/__init__.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.30.2.1 2004-05-06 23:04:01 richard Exp $
+# $Id: __init__.py,v 1.30.2.2 2004-05-13 00:26:07 richard Exp $
 
 '''Roundup - issue tracking for knowledge workers.
 
@@ -68,6 +68,6 @@
 '''
 __docformat__ = 'restructuredtext'
 
-__version__ = '0.7.1'
+__version__ = '0.7.2'
 
 # vim: set filetype=python ts=4 sw=4 et si

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.27 2004-05-06 03:18:03 richard Exp $
+#$Id: actions.py,v 1.27.2.1 2004-05-13 00:21:32 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random
 
@@ -558,10 +558,10 @@ def handle(self):
         "otk" performs the reset.
 
         """
+        otks = self.db.getOTKManager()
         if self.form.has_key('otk'):
             # pull the rego information out of the otk database
             otk = self.form['otk'].value
-            otks = self.db.getOTKManager()
             uid = otks.get(otk, 'uid')
             if uid is None:
                 self.client.error_message.append("""Invalid One Time Key!