Add 'executed' to old batches grid view, make timestamps show "raw" by default.
This commit is contained in:
parent
a7b73021ac
commit
a22f50850f
4 changed files with 54 additions and 10 deletions
|
@ -30,7 +30,7 @@ from .core import CustomFieldRenderer, DateFieldRenderer
|
|||
|
||||
from .common import (AutocompleteFieldRenderer,
|
||||
DecimalFieldRenderer, CurrencyFieldRenderer,
|
||||
DateTimeFieldRenderer,
|
||||
DateTimeFieldRenderer, DateTimePrettyFieldRenderer,
|
||||
EnumFieldRenderer, YesNoFieldRenderer)
|
||||
|
||||
from .people import (PersonFieldRenderer, PersonFieldLinkRenderer,
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
################################################################################
|
||||
#
|
||||
# Rattail -- Retail Software Framework
|
||||
# Copyright © 2010-2014 Lance Edgar
|
||||
# Copyright © 2010-2016 Lance Edgar
|
||||
#
|
||||
# This file is part of Rattail.
|
||||
#
|
||||
|
@ -24,13 +24,13 @@
|
|||
Common Field Renderers
|
||||
"""
|
||||
|
||||
from __future__ import unicode_literals
|
||||
from __future__ import unicode_literals, absolute_import
|
||||
|
||||
import formalchemy
|
||||
from formalchemy.fields import FieldRenderer, SelectFieldRenderer, CheckBoxFieldRenderer
|
||||
from pyramid.renderers import render
|
||||
|
||||
from tailbone.util import pretty_datetime
|
||||
from tailbone.util import pretty_datetime, raw_datetime
|
||||
|
||||
|
||||
class AutocompleteFieldRenderer(FieldRenderer):
|
||||
|
@ -77,6 +77,19 @@ class AutocompleteFieldRenderer(FieldRenderer):
|
|||
|
||||
|
||||
class DateTimeFieldRenderer(formalchemy.DateTimeFieldRenderer):
|
||||
"""
|
||||
This renderer assumes the datetime field value is in UTC, and will convert
|
||||
it to the local time zone before rendering it in the standard "raw" format.
|
||||
"""
|
||||
|
||||
def render_readonly(self, **kwargs):
|
||||
value = self.raw_value
|
||||
if not value:
|
||||
return ''
|
||||
return raw_datetime(self.request.rattail_config, value)
|
||||
|
||||
|
||||
class DateTimePrettyFieldRenderer(formalchemy.DateTimeFieldRenderer):
|
||||
"""
|
||||
Custom date/time field renderer, which displays a "pretty" value in
|
||||
read-only mode, leveraging config to show the correct timezone.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue