Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Political Memory
memopol
Commits
d9f800f7
Commit
d9f800f7
authored
Aug 07, 2016
by
Robin
Browse files
Merge branch 'v3laux' of github.com:political-memory/political_memory into v3laux
parents
8de78df4
561e609b
Changes
6
Hide whitespace changes
Inline
Side-by-side
memopol/api.py
View file @
d9f800f7
...
...
@@ -25,30 +25,6 @@ from representatives_recommendations.api import (
)
class
RQLCountryViewSet
(
CountryViewSet
):
filter_backends
=
CountryViewSet
.
filter_backends
+
[
RQLBackend
]
class
RQLChamberViewSet
(
ChamberViewSet
):
filter_backends
=
ChamberViewSet
.
filter_backends
+
[
RQLBackend
]
class
RQLConstituencyViewSet
(
ConstituencyViewSet
):
filter_backends
=
ConstituencyViewSet
.
filter_backends
+
[
RQLBackend
]
class
RQLGroupViewSet
(
GroupViewSet
):
filter_backends
=
GroupViewSet
.
filter_backends
+
[
RQLBackend
]
class
RQLMandateViewSet
(
MandateViewSet
):
filter_backends
=
MandateViewSet
.
filter_backends
+
(
RQLBackend
,)
class
RQLRepresentativeViewSet
(
RepresentativeViewSet
):
filter_backends
=
RepresentativeViewSet
.
filter_backends
+
(
RQLBackend
,)
class
RQLDossierViewSet
(
DossierViewSet
):
filter_backends
=
DossierViewSet
.
filter_backends
+
(
RQLBackend
,)
...
...
@@ -63,16 +39,16 @@ class RQLVoteViewSet(VoteViewSet):
router
=
routers
.
DefaultRouter
()
router
.
register
(
'countries'
,
RQL
CountryViewSet
,
'api-country'
)
router
.
register
(
'chambers'
,
RQL
ChamberViewSet
,
'api-chamber'
)
router
.
register
(
'constituencies'
,
RQL
ConstituencyViewSet
,
'api-constituency'
)
router
.
register
(
'countries'
,
CountryViewSet
,
'api-country'
)
router
.
register
(
'chambers'
,
ChamberViewSet
,
'api-chamber'
)
router
.
register
(
'constituencies'
,
ConstituencyViewSet
,
'api-constituency'
)
router
.
register
(
'dossiers'
,
RQLDossierViewSet
,
'api-dossier'
)
router
.
register
(
'dossier_scores'
,
DossierScoreViewSet
,
'api-dossierscore'
)
router
.
register
(
'groups'
,
RQL
GroupViewSet
,
'api-group'
)
router
.
register
(
'mandates'
,
RQL
MandateViewSet
,
'api-mandate'
)
router
.
register
(
'groups'
,
GroupViewSet
,
'api-group'
)
router
.
register
(
'mandates'
,
MandateViewSet
,
'api-mandate'
)
router
.
register
(
'proposals'
,
RQLProposalViewSet
,
'api-proposal'
)
router
.
register
(
'recommendations'
,
RecommendationViewSet
,
'api-recommendation'
)
router
.
register
(
'representatives'
,
RQL
RepresentativeViewSet
,
router
.
register
(
'representatives'
,
RepresentativeViewSet
,
'api-representative'
)
router
.
register
(
'scores'
,
RepresentativeScoreViewSet
,
'api-score'
)
router
.
register
(
'vote_scores'
,
VoteScoreViewSet
,
'api-votescore'
)
...
...
memopol/tests/test_dossiers.py
View file @
d9f800f7
# -*- coding: utf8 -*-
# -*- coding: utf
-
8 -*-
from
django.test
import
TestCase
...
...
memopol/tests/test_group_list.py
View file @
d9f800f7
# -*- coding: utf8 -*-
# -*- coding: utf
-
8 -*-
from
django.test
import
TestCase
...
...
memopol/tests/test_representatives_list.py
View file @
d9f800f7
# -*- coding: utf-8 -*-
from
django.test
import
TestCase
from
responsediff.response
import
Response
...
...
memopol/tests/test_themes.py
View file @
d9f800f7
# -*- coding: utf8 -*-
# -*- coding: utf
-
8 -*-
from
django.test
import
TestCase
...
...
setup.py
View file @
d9f800f7
...
...
@@ -18,7 +18,7 @@ setup(name='political-memory',
'django-filter>=0.13,<0.14'
,
'django-libsass>=0.7,<0.8'
,
'django-representatives-votes==0.0.24'
,
'django-representatives==0.0.3
3
'
,
'django-representatives==0.0.3
4
'
,
'django-rql-filter>=0.1.3,<0.2'
,
'django-taggit>=0.17,<0.18'
,
'django>=1.8,<1.9'
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment