radarsys Commit - r186:2de5a3865753 · Jicamarca Repository

1358

[filters.pop(key) for key in filters.keys() if filters[key] in ('', ' ')]

1358

[filters.pop(key) for key in filters.keys() if filters[key] in ('', ' ')]

1359

filters.pop('page', None)

1359

filters.pop('page', None)

1360

1361

if 'template' in filters:

1362

filters['template'] = True

1361

if 'start_date' in filters:

1363

if 'start_date' in filters:

1362

filters['start_date__gte'] = filters.pop('start_date')

1364

filters['start_date__gte'] = filters.pop('start_date')

1363

if 'end_date' in filters:

1365

if 'end_date' in filters:

1364

filters['start_date__lte'] = filters.pop('end_date')

1366

filters['start_date__lte'] = filters.pop('end_date')

1365

if 'tags' in filters:

1367

if 'tags' in filters:

1366

tags = filters.pop('tags')

1368

tags = filters.pop('tags')

1367

if ~~'tags'~~ in model._meta.get_~~all_~~field~~_name~~s():

1369

fields = [f.name for f in model._meta.get_fields()]

1370

1371

if 'tags' in fields:

1368

query = query | Q(tags__icontains=tags)

1372

query = query | Q(tags__icontains=tags)

1369

if 'name' in ~~model~~.~~_meta~~.~~get_all_~~field~~_name~~s():

1373

if 'name' in fields:

1370

query = query | Q(name__icontains=tags)

1374

query = query | Q(name__icontains=tags)

1371

if 'location' in ~~model~~.~~_meta~~.~~get_all_~~field~~_name~~s():

1375

if 'location' in fields:

1372

query = query | Q(location__name__icontains=tags)

1376

query = query | Q(location__name__icontains=tags)

1373

if 'device' in ~~model~~.~~_meta~~.~~get_all_~~field~~_name~~s():

1377

if 'device' in fields:

1374

query = query | Q(device__name__icontains=tags)

1378

query = query | Q(device__device_type__name__icontains=tags)

1375

1379

1376

object_list = model.objects.filter(query, **filters).order_by(*order)

1380

object_list = model.objects.filter(query, **filters).order_by(*order)

1377

paginator = Paginator(object_list, n)

1381

paginator = Paginator(object_list, n)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                 [filters.pop(key) for key in filters.keys() if filters[key] in ('', ' ')]
                 filters.pop('page', None)
+                if 'template' in filters:
+                    filters['template'] = True
                 if 'start_date' in filters:
                     filters['start_date__gte'] = filters.pop('start_date')
                 if 'end_date' in filters:
                     filters['start_date__lte'] = filters.pop('end_date')
                 if 'tags' in filters:
                     tags = filters.pop('tags')
-                    if 'tags' in model._meta.get_all_field_names():
+                    fields = [f.name for f in model._meta.get_fields()]
+                    if 'tags' in fields:
                         query = query | Q(tags__icontains=tags)
-                    if 'name' in model._meta.get_all_field_names():
+                    if 'name' in fields:
                         query = query | Q(name__icontains=tags)
-                    if 'location' in model._meta.get_all_field_names():
+                    if 'location' in fields:
                         query = query | Q(location__name__icontains=tags)
-                    if 'device' in model._meta.get_all_field_names():
+                    if 'device' in fields:
-                        query = query | Q(device__name__icontains=tags)
+                        query = query | Q(device__device_type__name__icontains=tags)
                 object_list = model.objects.filter(query, **filters).order_by(*order)
                 paginator = Paginator(object_list, n)