##// END OF EJS Templates
radarsys
RSS
Todo actualizado y Funcional (excepto redis,celery,nginx), y sin migraciones, ahora cambiaré de usuario
Renato-TUF -
r358:4e9ccf3e2223
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1705,31 +1705,30 def sidebar(**kwargs):
1705
1705
1706 return side_data
1706 return side_data
1707
1707
1708
1709 def get_paginator(model, page, order, filters={}, n=8):
1708 def get_paginator(model, page, order, filters={}, n=8):
1710
1711 kwargs = {}
1709 kwargs = {}
1712 query = Q()
1710 query = Q()
1713 if isinstance(filters, QueryDict):
1711 if isinstance(filters, QueryDict):
1714 filters = filters.dict()
1712 filters = filters.dict()
1715 [filters.pop(key) for key in filters.keys() if filters[key] in ('', ' ')]
1713 copy_filters=filters.copy()
1714 [filters.pop(key) for key in copy_filters.keys() if copy_filters[key] in (' ', ' ')]
1716 filters.pop('page', None)
1715 filters.pop('page', None)
1717
1716
1718 fields = [f.name for f in model._meta.get_fields()]
1717 fields = [f.name for f in model._meta.get_fields()]
1719
1718
1720 if 'template' in filters:
1719 if 'template' in copy_filters:
1721 filters['template'] = True
1720 filters['template'] = True
1722 if 'historical' in filters:
1721 if 'historical' in copy_filters:
1723 filters.pop('historical')
1722 filters.pop('historical')
1724 filters['type'] = 1
1723 filters['type'] = 1
1725 elif 'type' in fields:
1724 elif 'type' in fields:
1726 filters['type'] = 0
1725 filters['type'] = 0
1727 if 'start_date' in filters:
1726 if 'start_date' in copy_filters:
1728 filters['start_date__gte'] = filters.pop('start_date')
1727 filters['start_date__gte'] =filters.pop('start_date')
1729 if 'end_date' in filters:
1728 if 'end_date' in copy_filters:
1730 filters['start_date__lte'] = filters.pop('end_date')
1729 filters['start_date__lte'] =filters.pop('end_date')
1731 if 'tags' in filters:
1730 if 'tags' in copy_filters:
1732 tags = filters.pop('tags')
1731 tags =filters.pop('tags')
1733 if 'tags' in fields:
1732 if 'tags' in fields:
1734 query = query | Q(tags__icontains=tags)
1733 query = query | Q(tags__icontains=tags)
1735 if 'label' in fields:
1734 if 'label' in fields:
@@ -1742,9 +1741,9 def get_paginator(model, page, order, filters={}, n=8):
1742 if 'device_type' in fields:
1741 if 'device_type' in fields:
1743 query = query | Q(device_type__name__icontains=tags)
1742 query = query | Q(device_type__name__icontains=tags)
1744
1743
1745 if 'mine' in filters:
1744 if 'mine' in copy_filters:
1746 filters['author_id'] = filters['mine']
1745 filters['author_id'] =filters['mine']
1747 filters.pop('mine')
1746 filters.pop('mine')
1748 object_list = model.objects.filter(query, **filters).order_by(*order)
1747 object_list = model.objects.filter(query, **filters).order_by(*order)
1749 paginator = Paginator(object_list, n)
1748 paginator = Paginator(object_list, n)
1750
1749
@@ -1760,6 +1759,59 def get_paginator(model, page, order, filters={}, n=8):
1760
1759
1761 return kwargs
1760 return kwargs
1762
1761
1762 # def get_paginator(model, page, order, filters={}, n=8):
1763 # kwargs = {}
1764 # query = Q()
1765 # if isinstance(filters, QueryDict):
1766 # filters = filters.dict()
1767 # [filters.pop(key) for key in filters.keys() if filters[key] in ('', ' ')]
1768 # filters.pop('page', None)
1769
1770 # fields = [f.name for f in model._meta.get_fields()]
1771
1772 # if 'template' in filters:
1773 # filters['template'] = True
1774 # if 'historical' in filters:
1775 # filters.pop('historical')
1776 # filters['type'] = 1
1777 # elif 'type' in fields:
1778 # filters['type'] = 0
1779 # if 'start_date' in filters:
1780 # filters['start_date__gte'] = filters.pop('start_date')
1781 # if 'end_date' in filters:
1782 # filters['start_date__lte'] = filters.pop('end_date')
1783 # if 'tags' in filters:
1784 # tags = filters.pop('tags')
1785 # if 'tags' in fields:
1786 # query = query | Q(tags__icontains=tags)
1787 # if 'label' in fields:
1788 # query = query | Q(label__icontains=tags)
1789 # if 'location' in fields:
1790 # query = query | Q(location__name__icontains=tags)
1791 # if 'device' in fields:
1792 # query = query | Q(device__device_type__name__icontains=tags)
1793 # query = query | Q(device__location__name__icontains=tags)
1794 # if 'device_type' in fields:
1795 # query = query | Q(device_type__name__icontains=tags)
1796
1797 # if 'mine' in filters:
1798 # filters['author_id'] = filters['mine']
1799 # filters.pop('mine')
1800 # object_list = model.objects.filter(query, **filters).order_by(*order)
1801 # paginator = Paginator(object_list, n)
1802
1803 # try:
1804 # objects = paginator.page(page)
1805 # except PageNotAnInteger:
1806 # objects = paginator.page(1)
1807 # except EmptyPage:
1808 # objects = paginator.page(paginator.num_pages)
1809
1810 # kwargs['objects'] = objects
1811 # kwargs['offset'] = (int(page)-1)*n if page else 0
1812
1813 # return kwargs
1814
1763
1815
1764 def operation(request, id_camp=None):
1816 def operation(request, id_camp=None):
1765
1817
Show file before | Show file after | Hide comments
@@ -35,8 +35,6 INSTALLED_APPS = [
35 'django.contrib.sessions',
35 'django.contrib.sessions',
36 'django.contrib.messages',
36 'django.contrib.messages',
37 'django.contrib.staticfiles',
37 'django.contrib.staticfiles',
38 'django_bootstrap5',
39 'polymorphic',
40 'apps.accounts',
38 'apps.accounts',
41 'apps.main',
39 'apps.main',
42 'apps.misc',
40 'apps.misc',
@@ -47,6 +45,8 INSTALLED_APPS = [
47 'apps.abs',
45 'apps.abs',
48 'apps.cgs',
46 'apps.cgs',
49 'apps.dds_rest',
47 'apps.dds_rest',
48 "django_bootstrap5",
49 'polymorphic',
50 ]
50 ]
51
51
52 MIDDLEWARE = [
52 MIDDLEWARE = [
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now