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

fixed bug for use filters from the website

Browse source
This commit is contained in:
Cayo Puigdefabregas 2020-11-04 17:30:12 +01:00
parent abe7783b93
commit 9b25132c29
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ereuse_devicehub/resources/device/views.py
View file

@ -146,7 +146,7 @@ class DeviceView(View):
) )
def query(self, args): def query(self, args):
query = Device.query.distinct() # todo we should not force to do this if the query is ok query = Device.query.filter((Device.owner_id == g.user.id)).distinct()
search_p = args.get('search', None) search_p = args.get('search', None)
if search_p: if search_p:
properties = DeviceSearch.properties properties = DeviceSearch.properties
@ -156,17 +156,8 @@ class DeviceView(View):
).order_by( ).order_by(
search.Search.rank(properties, search_p) + search.Search.rank(tags, search_p) search.Search.rank(properties, search_p) + search.Search.rank(tags, search_p)
) )
query = self.visibility_filter(query)
return query.filter(*args['filter']).order_by(*args['sort']) return query.filter(*args['filter']).order_by(*args['sort'])
def visibility_filter(self, query):
filterqs = request.args.get('filter', None)
if (filterqs and
'lot' not in filterqs):
query = query.filter((Computer.id == Device.id), (Computer.owner_id == g.user.id))
pass
return query
class DeviceMergeView(View): class DeviceMergeView(View):
"""View for merging two devices """View for merging two devices