Merge pull request #123 from political-memory/themes

Add themes

memopol/filters.py

@@ -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

@@ -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

@@ -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

@@ -91,6 +91,7 @@ INSTALLED_APPS = (
     'core',
     'memopol',
     'memopol_settings',
+    'memopol_themes',
     'representatives',
     'representatives_votes',
     'representatives_recommendations',

memopol/tests/RepresentativeDetailTest/test_positions_display.html

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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_group.content

@@ -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_multiple.content

@@ -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_notfound.content

@@ -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_search.content

@@ -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_page1_paginateby12_active_displaylist.content

@@ -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_page1_paginateby12_all_displaylist.content

@@ -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_page1_paginateby12_displaylist_searchjoly.content

@@ -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_page1_paginateby24_active_displaygrid.content

@@ -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_page1_paginateby24_all_displaygrid.content

@@ -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_page2_paginateby12_displaylist.content

@@ -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_page2_paginateby24_displaylist.content

@@ -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_sorting.content

@@ -74,6 +74,11 @@
         Committees
       </a>
     </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
     <li>
       <a href='/votes/dossier/'>
         Dossiers

memopol/tests/response_fixtures/ThemesTest.test_theme_detail.content

+<!DOCTYPE html>
+<html class="no-js" lang="en"> <!--<![endif]-->
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" type="image/png" href="/static/collected/img/favicon.ico" />
+    <!-- Set the viewport width to device width for mobile -->
+    <meta name="viewport" content="width=device-width" />
+      <title>Home - Political Memory</title>
+    
+    
+    <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.586b8f5e9bff.css" type="text/css" />
+    <script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script>
+<script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script>
+    
+  </head>
+  <body >
+    <!-- -load memopol_tags cache -->
+
+
+
+
+<div id='header' class='container-fluid'>
+  <a id='logo' href='/'>
+    <img src='/static/collected/images/logo.png' />
+  </a>
+  <h1>
+    <a id='header_banner' href='/'>
+      Political Memory
+    </a>
+  </h1>
+  <p class='organization'>
+    
+
+  </p>
+</div>
+<div id='nav' class='container-fluid'>
+  <ul class='nav'>
+    <li>
+      <a href='/legislature/representative/'>
+        Representatives
+      </a>
+    </li>
+    <li>
+      <a href='/legislature/group/country/'>
+        Countries
+      </a>