diff --git a/wikilegis/api/resources.py b/wikilegis/api/resources.py index 6447baab..90759362 100644 --- a/wikilegis/api/resources.py +++ b/wikilegis/api/resources.py @@ -138,11 +138,12 @@ class Meta: reference__bill__status='draft' ).exclude(reference__bill__is_visible=False) allowed_methods = ['get'] - excludes = ['modified'] filtering = { 'author': ALL_WITH_RELATIONS, 'reference': ALL_WITH_RELATIONS, 'id': ALL, + 'created': ['exact', 'lt', 'lte', 'gte', 'gt'], + 'modified': ['exact', 'lt', 'lte', 'gte', 'gt'], } @@ -159,11 +160,12 @@ class Meta: replaced__bill__status='draft' ).exclude(replaced__bill__is_visible=False) allowed_methods = ['get'] - excludes = ['modified'] filtering = { 'author': ALL_WITH_RELATIONS, 'replaced': ALL_WITH_RELATIONS, 'id': ALL, + 'created': ['exact', 'lt', 'lte', 'gte', 'gt'], + 'modified': ['exact', 'lt', 'lte', 'gte', 'gt'], } @@ -180,11 +182,12 @@ class Meta: supressed__bill__status='draft' ).exclude(supressed__bill__is_visible=False) allowed_methods = ['get'] - excludes = ['modified'] filtering = { 'author': ALL_WITH_RELATIONS, 'supressed': ALL_WITH_RELATIONS, 'id': ALL, + 'created': ['exact', 'lt', 'lte', 'gte', 'gt'], + 'modified': ['exact', 'lt', 'lte', 'gte', 'gt'], } @@ -209,6 +212,8 @@ class Meta: 'author': ALL_WITH_RELATIONS, 'vote': ALL, 'id': ALL, + 'created': ['exact', 'lt', 'lte', 'gte', 'gt'], + 'modified': ['exact', 'lt', 'lte', 'gte', 'gt'], } @@ -225,4 +230,6 @@ class Meta: filtering = { 'author': ALL_WITH_RELATIONS, 'id': ALL, + 'created': ['exact', 'lt', 'lte', 'gte', 'gt'], + 'modified': ['exact', 'lt', 'lte', 'gte', 'gt'], } diff --git a/wikilegis/core/plugins.py b/wikilegis/core/plugins.py index d8dd21a5..9fc8f6ac 100644 --- a/wikilegis/core/plugins.py +++ b/wikilegis/core/plugins.py @@ -4,7 +4,7 @@ from django.conf import settings import importlib -import pip +from pip import _internal as pip PLUGINS_CONFIG_FILE = settings.BASE_DIR + '/.plugins' diff --git a/wikilegis/public/media/brasao.png b/wikilegis/public/media/brasao.png new file mode 100644 index 00000000..3db7fbbc Binary files /dev/null and b/wikilegis/public/media/brasao.png differ