trustchain-oc1-orchestral/devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix doble query

Browse source
This commit is contained in:
Cayo Puigdefabregas 2022-02-02 13:51:54 +01:00
parent 8149d0ed7c
commit 71f5a8a98b
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ereuse_devicehub/inventory/forms.py
View file

@ -418,7 +418,6 @@ class TagDeviceForm(FlaskForm):
self.delete = kwargs.pop('delete', None)
self.device_id = kwargs.pop('device', None)
# import pdb; pdb.set_trace()
super().__init__(*args, **kwargs)
if self.delete:
@ -479,12 +478,13 @@ class NewActionForm(FlaskForm):
if not is_valid:
return False
devices = set(self.devices.data.split(","))
self._devices = OrderedSet(Device.query.filter(Device.id.in_(devices)).filter(
Device.owner_id == g.user.id).all())
if self.devices.data:
devices = set(self.devices.data.split(","))
self._devices = OrderedSet(Device.query.filter(Device.id.in_(devices)).filter(
Device.owner_id == g.user.id).all())
if not self._devices:
return False
if not self._devices:
return False
return True
@ -497,12 +497,12 @@ class NewActionForm(FlaskForm):
self.severity.data = Severity[self.severity.data]
self.populate_obj(self.instance)
db.session.add(self.instance)
db.session.commit()
self.devices.data = devices
self.severity.data = severity
db.session.add(self.instance)
db.session.commit()
return self.instance

3
ereuse_devicehub/inventory/views.py
View file

@ -297,11 +297,12 @@ class NewAllocateView(NewActionView, DeviceListMix):
def dispatch_request(self):
dispatch = super().dispatch_request()
if self.form.validate_on_submit():
if dispatch.status_code == 302:
return dispatch
# lot_id = self.form.lot.data
# FIXME
# import pdb; pdb.set_trace()
self.get_context(None)
return flask.render_template(self.template_name, **self.context)