merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -8,6 +8,8 @@ Fixed:
 - HTML templating isset() inverted (sf bug 951779)
 - otks manager missing (sf bug 952931)
 - mention DEFAULT_TIMEZONE requirement in upgrading doc (sf bug 952932)
+- fix DateHTMLProperty so local() can override user timezone (sf bug
+  953678)
 
 
 2004-05-07 0.7.1

doc/index.txt

@@ -115,12 +115,13 @@ John P. Rouillard,
 Ollie Rutherfurd,
 Toby Sargeant,
 Florian Schulze,
+Klamer Schutte,
 Dougal Scott,
 Stefan Seefeld,
 Jeffrey P Shell,
-Klamer Schutte,
 Joel Shprentz,
 Terrel Shumway,
+Emil Sit,
 Nathaniel Smith,
 Mike Thompson,
 Darryl VanDorp,

roundup/cgi/templating.py

@@ -671,7 +671,7 @@ def submit(self, label="Submit Changes"):
         Also sneak in the lastactivity and action hidden elements.
         """
         return self.input(type="hidden", name="@lastactivity",
-            value=self.activity) + '\n' + \
+            value=self.activity.local(0)) + '\n' + \
             self.input(type="hidden", name="@action", value="edit") + '\n' + \
             self.input(type="submit", name="submit", value=label)
 
@@ -1269,14 +1269,24 @@ def field(self):
         return s
 
 class DateHTMLProperty(HTMLProperty):
+    def __init__(self, client, classname, nodeid, prop, name, value,
+            anonymous=0, offset=None):
+        HTMLProperty.__init__(self, client, classname, nodeid, prop, name,
+                value, anonymous=anonymous)
+        self._offset = offset
+
     def plain(self):
         ''' Render a "plain" representation of the property
         '''
         self.view_check()
 
         if self._value is None:
             return ''
-        return str(self._value.local(self._db.getUserTimezone()))
+        if self._offset is None:
+            offset = self._db.getUserTimezone()
+        else:
+            offset = self._offset
+        return str(self._value.local(offset))
 
     def now(self):
         ''' Return the current time.
@@ -1346,7 +1356,7 @@ def local(self, offset):
         self.view_check()
 
         return DateHTMLProperty(self._client, self._classname, self._nodeid,
-            self._prop, self._formname, self._value.local(offset))
+            self._prop, self._formname, self._value, offset=offset)
 
 class IntervalHTMLProperty(HTMLProperty):
     def plain(self):