rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Update tempmon UI now that enabled flags are really datetime in DB

Browse source
This commit is contained in:
Lance Edgar 2019-01-25 19:36:13 -06:00
parent 90e1baef50
commit eb78d79bb3
4 changed files with 75 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tailbone/views/tempmon/clients.py
View file

@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
# Copyright © 2010-2018 Lance Edgar
# Copyright © 2010-2019 Lance Edgar
#
# This file is part of Rattail.
#
@ -34,6 +34,7 @@ from rattail_tempmon.db import model as tempmon
import colander
from webhelpers2.html import HTML, tags
from tailbone import forms
from tailbone.views.tempmon import MasterView
@ -101,6 +102,9 @@ class TempmonClientView(MasterView):
# disk_type
g.set_enum('disk_type', self.enum.TEMPMON_DISK_TYPE)
# enabled
g.set_type('enabled', 'boolean')
# archived
g.filters['archived'].default_active = True
g.filters['archived'].default_verb = 'is_false'
@ -134,6 +138,8 @@ class TempmonClientView(MasterView):
f.set_type('notes', 'text')
# enabled
if self.creating or self.editing:
f.set_node('enabled', forms.types.DateTimeBoolean())
f.set_helptext('enabled', tempmon.Client.enabled.__doc__)
# online
@ -145,6 +151,18 @@ class TempmonClientView(MasterView):
# archived
f.set_helptext('archived', tempmon.Client.archived.__doc__)
def objectify(self, form, data=None):
# this is a hack to prevent updates to the 'enabled' timestamp, when
# simple edits are being done to the client. i.e. we do want to set
# the timestamp when it was previously null, but not otherwise.
if self.editing:
data = dict(data or form.validated)
if data['enabled'] and form.model_instance.enabled:
data['enabled'] = form.model_instance.enabled
return super(TempmonClientView, self).objectify(form, data=data)
def unique_config_key(self, node, value):
query = self.Session.query(tempmon.Client)\
.filter(tempmon.Client.config_key == value)

19
tailbone/views/tempmon/probes.py
View file

@ -37,7 +37,7 @@ import colander
from deform import widget as dfwidget
from webhelpers2.html import tags
from tailbone import grids
from tailbone import forms, grids
from tailbone.views.tempmon import MasterView
@ -168,6 +168,23 @@ class TempmonProbeView(MasterView):
if self.creating or self.editing:
f.remove_fields('status')
# enabled
if self.creating or self.editing:
f.set_node('enabled', forms.types.DateTimeBoolean())
f.set_helptext('enabled', tempmon.Probe.enabled.__doc__)
def objectify(self, form, data=None):
# this is a hack to prevent updates to the 'enabled' timestamp, when
# simple edits are being done to the probe. i.e. we do want to set the
# timestamp when it was previously null, but not otherwise.
if self.editing:
data = dict(data or form.validated)
if data['enabled'] and form.model_instance.enabled:
data['enabled'] = form.model_instance.enabled
return super(TempmonProbeView, self).objectify(form, data=data)
def unique_config_key(self, node, value):
query = self.Session.query(tempmon.Probe)\
.filter(tempmon.Probe.config_key == value)