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

fixing the order of the device list and force the list of the lots instead of use a generator

Browse source
This commit is contained in:
Cayo Puigdefabregas 2022-01-18 11:24:27 +01:00
parent f738abfab0
commit afb2a45220
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ereuse_devicehub/inventory/views.py
View file

@ -28,7 +28,8 @@ class DeviceListView(View):
else: else:
devices = Device.query.filter( devices = Device.query.filter(
Device.owner_id == current_user.id).filter( Device.owner_id == current_user.id).filter(
Device.type.in_(filter_types)).filter(Device.lots == None).order_by('id', 'updated') Device.type.in_(filter_types)).filter(Device.lots == None).order_by(
Device.updated.desc())
context = {'devices': devices, context = {'devices': devices,
'lots': lots, 'lots': lots,
@ -130,14 +131,10 @@ class UploadSnapshotView(View):
template_name = 'inventory/upload_snapshot.html' template_name = 'inventory/upload_snapshot.html'
def dispatch_request(self): def dispatch_request(self):
lots = Lot.query.filter(Lot.owner_id == current_user.id) lots = Lot.query.filter(Lot.owner_id == current_user.id).all()
form = UploadSnapshotForm() form = UploadSnapshotForm()
if form.validate_on_submit(): if form.validate_on_submit():
form.save() form.save()
if any([x == 'Error' for x in form.result.values()]):
return flask.render_template(self.template_name, form=form, lots=lots)
next_url = url_for('inventory.devices.devicelist')
return flask.redirect(next_url)
return flask.render_template(self.template_name, form=form, lots=lots) return flask.render_template(self.template_name, form=form, lots=lots)