ereuse/devicehub-django
8
0
Fork 0
Code Issues 5 Pull requests 9 Packages Projects Releases Wiki Activity

admin lot tags #47

Open
cayop wants to merge 7 commits from lots-tags into main
pull from: lots-tags
merge into: ereuse:main
Conversation 1 Commits 7 Files changed 15 +1 -1
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3c40586807 - Show all commits

1
dashboard/views.py
View file

@ -29,7 +29,6 @@ class AllDevicesView(InventaryMixin):
breadcrumb = "Devices / All Devices" breadcrumb = "Devices / All Devices"
def get_devices(self, user, offset, limit): def get_devices(self, user, offset, limit):
import pdb; pdb.set_trace()
return Device.get_all(self.request.user.institution, offset, limit) return Device.get_all(self.request.user.institution, offset, limit)

1
device/models.py
View file

@ -136,6 +136,7 @@ class Device:
self.lots = [ self.lots = [
x.lot for x in DeviceLot.objects.filter(device_id=self.id)] x.lot for x in DeviceLot.objects.filter(device_id=self.id)]
@classmethod
def get_all(cls, institution, offset=0, limit=None): def get_all(cls, institution, offset=0, limit=None):
sql = """ sql = """
WITH RankedAnnotations AS ( WITH RankedAnnotations AS (