From ec036522a426b64d0e41cdf7ac93ff3334409224 Mon Sep 17 00:00:00 2001
From: Emilie <zawadzki@ircam.fr>
Date: Thu, 7 Jul 2016 17:51:09 +0200
Subject: [PATCH] deleting autocompletion

---
 app/local_settings.py               |  6 ------
 app/organization/featured/models.py |  2 ++
 app/organization/magazine/admin.py  |  9 +--------
 app/organization/magazine/urls.py   | 15 ---------------
 app/organization/magazine/views.py  | 12 ++++++++++++
 app/settings.py                     |  1 -
 requirements.txt                    |  1 -
 7 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/app/local_settings.py b/app/local_settings.py
index 742895b5..fdf1d784 100644
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -140,9 +140,3 @@ DEBUG_TOOLBAR_PANELS = [
 
 # slug
 BLOG_SLUG = 'article'
-
-
-AJAX_LOOKUP_CHANNELS = {
-  'article': {'model': 'organization.magazine.article', 'search_field': 'title'},
-  'basepage': {'model': 'organization.core.basepage', 'search_field': 'title'},
-}
diff --git a/app/organization/featured/models.py b/app/organization/featured/models.py
index ae59ea49..0a577187 100644
--- a/app/organization/featured/models.py
+++ b/app/organization/featured/models.py
@@ -20,6 +20,8 @@ class Featured(Named):
     events = models.ManyToManyField(Event, verbose_name=_('events'), related_name='featured', blank=True)
     videos = models.ManyToManyField(Video, verbose_name=_('videos'), related_name='featured', blank=True)
     playlists = models.ManyToManyField(Playlist, verbose_name=_('playlists'), related_name='featured', blank=True)
+    playlists = models.ManyToManyField(Playlist, verbose_name=_('playlists'), related_name='featured', blank=True)
+
 
     def __unicode__(self):
         return self.name
diff --git a/app/organization/magazine/admin.py b/app/organization/magazine/admin.py
index 1554530c..1415a658 100644
--- a/app/organization/magazine/admin.py
+++ b/app/organization/magazine/admin.py
@@ -3,21 +3,14 @@ from django import forms
 from copy import deepcopy
 from mezzanine.core.admin import DisplayableAdmin
 from organization.magazine.models import Brief
-from ajax_select import make_ajax_form
-from ajax_select.admin import AjaxSelectAdmin
-from ajax_select.fields import AutoCompleteSelectField
-from organization.magazine.models import Brief
 
 
-class BriefAdmin(AjaxSelectAdmin):
+class BriefAdmin(admin.ModelAdmin):
 
     model = Brief
 
 class BriefAdminDisplayable(DisplayableAdmin):
 
-    #make_ajax_form(Label, {'ville': 'ville'})
-    #id_local_content = AutoCompleteSelectField('local_content', label="local_content")
-    form = make_ajax_form(Brief, {'local_content': 'article'})
     fieldsets = deepcopy(BriefAdmin.fieldsets)
 
 admin.site.register(Brief, BriefAdminDisplayable)
diff --git a/app/organization/magazine/urls.py b/app/organization/magazine/urls.py
index d3336dde..e69de29b 100644
--- a/app/organization/magazine/urls.py
+++ b/app/organization/magazine/urls.py
@@ -1,15 +0,0 @@
-from __future__ import unicode_literals
-
-from django.conf.urls import patterns, include, url
-from django.conf.urls.i18n import i18n_patterns
-from django.contrib import admin
-
-from django.conf.urls import *
-from django.contribimport admin
-from ajax_select import urls as ajax_select_urls
-
-admin.autodiscover()
-
-urlpatterns = [
-    urls (r'^admin/lookups/', include(ajax_select_urls)), (r'^admin/', include(admin.site.urls)),
-]
diff --git a/app/organization/magazine/views.py b/app/organization/magazine/views.py
index 91ea44a2..5cbbc206 100644
--- a/app/organization/magazine/views.py
+++ b/app/organization/magazine/views.py
@@ -1,3 +1,15 @@
 from django.shortcuts import render
+from django.views.generic import *
+from django.views.generic.base import *
+from django.shortcuts import get_object_or_404
 
 # Create your views here.
+class BriefDetailView(SlugMixin, DetailView):
+
+    model = Brief
+    template_name='magazine/inc_brief.html'
+    context_object_name = 'brief'
+
+    def get_context_data(self, **kwargs):
+        context = super(BriefDetailView, self).get_context_data(**kwargs)
+        return context
diff --git a/app/settings.py b/app/settings.py
index 6b5a6226..04e094b7 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -218,7 +218,6 @@ INSTALLED_APPS = [
     'djangobower',
     "meta",
     "mezzanine_agenda",
-    "ajax_select",
     "organization.core",
     "organization.structure",
     "organization.festival",
diff --git a/requirements.txt b/requirements.txt
index a7f0e9e4..080247cd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,4 +12,3 @@ django-bower
 django-debug-toolbar
 django-extensions
 django-countries
-django-ajax-selects
-- 
2.39.5