Mercurial > p > roundup > code
comparison roundup/cgi/templating.py @ 2580:e90d63c7eceb
fixed DateHTMLProperty for invalid date entry [SF#986538]
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Mon, 19 Jul 2004 00:44:01 +0000 |
| parents | 1a041cda628c |
| children | 0db668d44917 |
comparison
equal
deleted
inserted
replaced
| 2578:7f25486ff85e | 2580:e90d63c7eceb |
|---|---|
| 1376 offset = self._db.getUserTimezone() | 1376 offset = self._db.getUserTimezone() |
| 1377 else: | 1377 else: |
| 1378 offset = self._offset | 1378 offset = self._offset |
| 1379 return str(self._value.local(offset)) | 1379 return str(self._value.local(offset)) |
| 1380 | 1380 |
| 1381 def now(self, str_interval = None): | 1381 def now(self, str_interval=None): |
| 1382 ''' Return the current time. | 1382 ''' Return the current time. |
| 1383 | 1383 |
| 1384 This is useful for defaulting a new value. Returns a | 1384 This is useful for defaulting a new value. Returns a |
| 1385 DateHTMLProperty. | 1385 DateHTMLProperty. |
| 1386 ''' | 1386 ''' |
| 1400 ret = ret - interval | 1400 ret = ret - interval |
| 1401 | 1401 |
| 1402 return DateHTMLProperty(self._client, self._classname, self._nodeid, | 1402 return DateHTMLProperty(self._client, self._classname, self._nodeid, |
| 1403 self._prop, self._formname, ret) | 1403 self._prop, self._formname, ret) |
| 1404 | 1404 |
| 1405 def field(self, size = 30, default = None): | 1405 def field(self, size=30, default=None): |
| 1406 ''' Render a form edit field for the property | 1406 ''' Render a form edit field for the property |
| 1407 | 1407 |
| 1408 If not editable, just display the value via plain(). | 1408 If not editable, just display the value via plain(). |
| 1409 ''' | 1409 ''' |
| 1410 self.view_check() | 1410 self.view_check() |
| 1420 elif isinstance(default, DateHTMLProperty): | 1420 elif isinstance(default, DateHTMLProperty): |
| 1421 raw_value = default._value | 1421 raw_value = default._value |
| 1422 else: | 1422 else: |
| 1423 raise ValueError, _('default value for ' | 1423 raise ValueError, _('default value for ' |
| 1424 'DateHTMLProperty must be either DateHTMLProperty ' | 1424 'DateHTMLProperty must be either DateHTMLProperty ' |
| 1425 'or string date representation.') | 1425 'or string date representation.') |
| 1426 else: | 1426 else: |
| 1427 raw_value = self._value | 1427 raw_value = self._value |
| 1428 | 1428 |
| 1429 if raw_value is None: | 1429 if raw_value is None: |
| 1430 value = '' | 1430 value = '' |
| 1431 elif type(raw_value) is type(''): | |
| 1432 value = raw_value | |
| 1431 else: | 1433 else: |
| 1432 tz = self._db.getUserTimezone() | 1434 tz = self._db.getUserTimezone() |
| 1433 value = cgi.escape(str(raw_value.local(tz))) | 1435 value = cgi.escape(str(raw_value.local(tz))) |
| 1434 | 1436 |
| 1435 if self.is_edit_ok(): | 1437 if self.is_edit_ok(): |