CAMP/itf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make object_id handling a little cleaner, tho still broken

Browse Source
This commit is contained in:
Sanj 2011-10-24 00:53:51 +01:00
parent 5603c0fefa
commit 93243a7be7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
itf/app/models.py
View File

@ -256,14 +256,6 @@ class ItfModel(models.Model):
except:
qset = kls.objects.all()
if options['object_id'] != False and options['object_id'] != '':
object_id = options['object_id']
qset = qset.exclude(pk=object_id)
try:
obj = kls.objects.get(pk=object_id)
ret.append(obj.list_dict())
except:
pass
search = options['search']
if search != '':
@ -295,6 +287,17 @@ class ItfModel(models.Model):
for r in results.object_list:
ret.append(r.list_dict())
#FIXME: object_id needs to do something more graceful, this breaks sort.
if options['object_id'] != False and options['object_id'] != '':
object_id = options['object_id']
qset = qset.exclude(pk=object_id)
try:
obj = kls.objects.get(pk=object_id)
ret.append(obj.list_dict())
except:
pass
return {
'page_no': page_no,
'num_pages': paginator.num_pages,