ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

fix conflict issue

Browse Source
This commit is contained in:
bkfox
2016-05-26 01:56:09 +02:00
parent a989e53da4
commit 7402fc49b6
7 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
programs/admin.py
View File

@ -113,8 +113,8 @@ class DiffusionAdmin (admin.ModelAdmin):
def get_queryset(self, request):
qs = super(DiffusionAdmin, self).get_queryset(request)
if '_changelist_filters' in request.GET or \
'type__exact' in request.GET and \
if ('_changelist_filters' in request.GET or \
'type__exact' in request.GET) and \
str(Diffusion.Type.unconfirmed) in request.GET['type__exact']:
return qs
return qs.exclude(type = Diffusion.Type.unconfirmed)