Ajustement de l'admin suite au passage à Sphinx.

diff --git a/auf_savoirs_en_partage/chercheurs/admin.py b/auf_savoirs_en_partage/chercheurs/admin.py
index 158aac2..e0b37ba 100644 (file)
--- a/auf_savoirs_en_partage/chercheurs/admin.py
+++ b/auf_savoirs_en_partage/chercheurs/admin.py
@@ -12,6 +12,9 @@ class ChercheurAdmin(admin.ModelAdmin):
     actions = ('remove_from_group',)
     search_fields = ('personne__nom', 'personne__prenom')
 
+    def queryset(self, request):
+        return Chercheur.all_objects.get_query_set()
+
     def remove_from_group(self, request, queryset):
         groupe_id = request.GET.get('groupes__id__exact')
         chercheur_ids = queryset.values_list('id', flat=True)

diff --git a/auf_savoirs_en_partage/development.py b/auf_savoirs_en_partage/development.py
index ce669b3..d5eb751 100644 (file)
--- a/auf_savoirs_en_partage/development.py
+++ b/auf_savoirs_en_partage/development.py
@@ -8,7 +8,7 @@ INTERNAL_IPS = ('127.0.0.1',)
 
 # MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 # INSTALLED_APPS += ('debug_toolbar',)
-# DEBUG_TOOLBAR_CONFIG = dict(INTERCEPT_REDIRECTS=False)
+# DEBUG_TOOLBAR_CONFIG = dict(INTERCEPT_REDIRECTS=True)
 
 # Profiling
 

diff --git a/auf_savoirs_en_partage/savoirs/admin.py b/auf_savoirs_en_partage/savoirs/admin.py
index e517083..10dae3b 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/admin.py
+++ b/auf_savoirs_en_partage/savoirs/admin.py
@@ -1,8 +1,9 @@
 # -*- encoding: utf-8 -*-
+import operator
 import re
-
 from django.core.urlresolvers import reverse as url
 from django.db import models
+from django.db.models import Q
 from django.db.models.query import QuerySet
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
@@ -143,7 +144,7 @@ class RecordAdmin(ReadOnlyAdminFields, admin.ModelAdmin):
         self.readonly_fields.append('listsets')
         super(RecordAdmin, self).__init__(*args, **kwargs) 
 
-    def queryset(self):
+    def queryset(self, request):
         return RecordAdminQuerySet(Record)
 
     # Présentation de l'information
@@ -224,6 +225,9 @@ class ActualiteAdmin(admin.ModelAdmin):
     list_display = ('titre', 'source', 'date', 'visible')
     actions = ['rendre_visible', 'rendre_invisible', 'assigner_regions', 'assigner_disciplines']
 
+    def queryset(self, request):
+        return Actualite.all_objects.get_query_set()
+
     # actions
     def rendre_visible(self, request, queryset):
         selected = request.POST.getlist(admin.ACTION_CHECKBOX_NAME)
@@ -270,6 +274,9 @@ class EvenementAdmin(admin.ModelAdmin):
               'description', 'contact', 'url', 'approuve']
     actions = ['assigner_regions', 'assigner_disciplines']
 
+    def queryset(self, request):
+        return Evenement.all_objects.get_query_set()
+
     def assigner_regions(self, request, queryset):
         selected = request.POST.getlist(admin.ACTION_CHECKBOX_NAME)
         return HttpResponseRedirect(url('assigner_regions', kwargs=dict(app_name='savoirs', model_name='evenement')) + '?ids=' + ','.join(selected))