Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TAlone
memopol
Commits
ea84bcb7
Commit
ea84bcb7
authored
Aug 07, 2016
by
njoyard
Committed by
GitHub
Aug 07, 2016
Browse files
Merge pull request #123 from political-memory/themes
Add themes
parents
69861a94
b6432187
Changes
61
Hide whitespace changes
Inline
Side-by-side
memopol/filters.py
View file @
ea84bcb7
...
...
@@ -11,6 +11,7 @@ from django_filters import FilterSet, MethodFilter, ModelChoiceFilter
from
representatives.models
import
Chamber
,
Group
,
Representative
from
representatives_votes.models
import
Dossier
from
memopol_themes.models
import
Theme
def
rep_chamber_filter
(
qs
,
value
):
...
...
@@ -77,3 +78,19 @@ class DossierFilter(FilterSet):
return
qs
.
filter
(
Q
(
title__icontains
=
value
)
|
Q
(
reference__icontains
=
value
))
class
ThemeFilter
(
FilterSet
):
search
=
MethodFilter
(
action
=
'search_filter'
)
class
Meta
:
model
=
Theme
fields
=
[
'search'
]
def
search_filter
(
self
,
qs
,
value
):
if
len
(
value
)
==
0
:
return
qs
return
qs
.
filter
(
Q
(
name__icontains
=
value
)
|
Q
(
description__icontains
=
value
))
memopol/fixtures/one_representative.json
View file @
ea84bcb7
...
...
@@ -1084,82 +1084,13 @@
"model"
:
"representatives_recommendations.recommendation"
,
"pk"
:
47
},
{
"fields"
:
{
"name"
:
"acta"
,
"slug"
:
"acta"
},
"model"
:
"taggit.tag"
,
"pk"
:
1
},
{
"fields"
:
{
"name"
:
"foo"
,
"slug"
:
"foo"
},
"model"
:
"taggit.tag"
,
"pk"
:
2
},
{
"fields"
:
{
"name"
:
"bar"
,
"slug"
:
"bar"
},
"model"
:
"taggit.tag"
,
"pk"
:
3
},
{
"fields"
:
{
"model"
:
"position"
,
"app_label"
:
"representatives_positions"
},
"model"
:
"contenttypes.contenttype"
,
"pk"
:
29
},
{
"fields"
:
{
"tag"
:
1
,
"object_id"
:
1
,
"content_type"
:
29
},
"model"
:
"taggit.taggeditem"
,
"pk"
:
1
},
{
"fields"
:
{
"tag"
:
2
,
"object_id"
:
1
,
"content_type"
:
29
},
"model"
:
"taggit.taggeditem"
,
"pk"
:
2
},
{
"fields"
:
{
"tag"
:
1
,
"object_id"
:
3
,
"content_type"
:
29
},
"model"
:
"taggit.taggeditem"
,
"pk"
:
5
},
{
"fields"
:
{
"tag"
:
1
,
"object_id"
:
2
,
"content_type"
:
29
},
"model"
:
"taggit.taggeditem"
,
"pk"
:
6
},
{
"fields"
:
{
"tag"
:
3
,
"object_id"
:
2
,
"content_type"
:
29
},
"model"
:
"taggit.taggeditem"
,
"pk"
:
7
"pk"
:
31
},
{
"fields"
:
{
...
...
memopol/fixtures/smaller_sample.json
View file @
ea84bcb7
...
...
@@ -23200,5 +23200,32 @@
},
"model": "representatives_recommendations.recommendation",
"pk": 47
},
{
"fields": {
"description": "The Anti-Counterfeiting Trade agreement is a really bad thing, we would like to kill it with fire.",
"positions": [
],
"proposals": [
5744, 5745, 5746
],
"dossiers": [
28147
],
"slug": "acta",
"name": "acta"
},
"model": "memopol_themes.theme",
"pk": 1
},
{
"fields": {
"theme": 1,
"datetime": "2008-01-01",
"link": "http://www.laquadrature.net",
"title": "Press release on ACTA from La Quadrature du Net"
},
"model": "memopol_themes.themelink",
"pk": 1
}
]
memopol/settings.py
View file @
ea84bcb7
...
...
@@ -91,6 +91,7 @@ INSTALLED_APPS = (
'core'
,
'memopol'
,
'memopol_settings'
,
'memopol_themes'
,
'representatives'
,
'representatives_votes'
,
'representatives_recommendations'
,
...
...
memopol/tests/RepresentativeDetailTest/test_positions_display.html
View file @
ea84bcb7
...
...
@@ -10,17 +10,6 @@
first-validated
</a>
</td>
<td>
<span
class=
'label label-default'
>
acta
</span>
<span
class=
'label label-default'
>
bar
</span>
</td>
<td>
<a
href=
'http://example.com/first-validated'
>
http://example.com/first-validated
...
...
@@ -36,13 +25,6 @@
other-validated
</a>
</td>
<td>
<span
class=
'label label-default'
>
acta
</span>
</td>
<td>
<a
href=
'http://example.com/second-validated'
>
http://example.com/second-validated
...
...
memopol/tests/response_fixtures/DossiersTest.test_dossier_detail.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/DossiersTest.test_dossier_list.content
View file @
ea84bcb7
...
...
@@ -69,6 +69,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/DossiersTest.test_dossier_search.content
View file @
ea84bcb7
...
...
@@ -69,6 +69,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/DossiersTest.test_dossier_search_noresults.content
View file @
ea84bcb7
...
...
@@ -69,6 +69,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/DossiersTest.test_dossier_sorting.content
View file @
ea84bcb7
...
...
@@ -69,6 +69,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/GroupListTest.test_active_committees.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/GroupListTest.test_active_delegations.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/GroupListTest.test_active_parties.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/GroupListTest.test_all_committees.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/GroupListTest.test_all_delegations.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/GroupListTest.test_all_parties.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/GroupListTest.test_chambers.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/GroupListTest.test_country.content
View file @
ea84bcb7
...
...
@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/RepresentativeListTest.test_filter_chamber.content
View file @
ea84bcb7
...
...
@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
memopol/tests/response_fixtures/RepresentativeListTest.test_filter_country.content
View file @
ea84bcb7
...
...
@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a
href=
'/theme/'
>
Themes
</a>
</li>
<li>
<a
href=
'/votes/dossier/'
>
Dossiers
...
...
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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