deleting autocompletion

diff --git a/app/local_settings.py b/app/local_settings.py
index 742895b5168294f3e738142874b3682d99b6fb6f..fdf1d784c46f6006088320c776b03e41b8b79193 100644 (file)
--- 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 ae59ea49d9289dac7c25f4eab8f6c97c908591e2..0a577187bdc76ad7b99d01a1d0bc2e3c394285b4 100644 (file)
--- 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 1554530c9239c511a59ff9782a5423efdb5266bc..1415a65887698a9111fd71ac841e383730472398 100644 (file)
--- 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 d3336dde9b72ac2767044c07958b7b932ae8109d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 91ea44a218fbd2f408430959283f0419c921093e..5cbbc20664e9ad2781ca6d6b8d6b722d03d85eb9 100644 (file)
--- 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 6b5a622682fffaaef6b04160b9f974678eeb1907..04e094b75882d05197f017ca4ceb494a9921b26d 100644 (file)
--- 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 a7f0e9e4ae6f9c7af239315d504f0cb5d2b11e5d..080247cda17ed84719479dcaa798c5a47a9d60c6 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,4 +12,3 @@ django-bower
 django-debug-toolbar
 django-extensions
 django-countries
-django-ajax-selects