From: Olivier Larchevêque <olivier.larcheveque@auf.org>
Date: Wed, 13 Jul 2011 13:14:41 +0000 (-0400)
Subject: search alphabetic
X-Git-Tag: DAE+RH~288
X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=387ab827a3c3d1b9ba3ad00e98bb3a6415b3513b;hp=7ffc5aa48c1ff4d0cbc8ca4d102d953d6c7785bb

search alphabetic
---

diff --git a/buildout.cfg b/buildout.cfg
index 4ff5fbb..0fc34c8 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -43,7 +43,7 @@ auf.django.auth = 0.5.5dev
 django-reversion = 1.3.3
 auf.django.workflow = 0.14dev
 django-ajax-selects = 1.1.4
-django-alphafilter = 0.5.2auf2
+django-alphafilter = 0.5.3auf2
 #reportlab = 2.5
 #html5lib = 0.90
 #pyPDF = 1.13
diff --git a/project/rh/lib.py b/project/rh/lib.py
index edfe401..6d1b43e 100644
--- a/project/rh/lib.py
+++ b/project/rh/lib.py
@@ -99,6 +99,7 @@ class AyantDroitAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     """
     L'ajout d'un nouvel ayantdroit se fait dans l'admin de l'employé.
     """
+    alphabet_filter = 'nom'
     search_fields = ('nom', 'prenom', 'employe__nom', 'employe__prenom', )
     list_display = ('_employe', 'lien_parente', '_ayantdroit', )
     inlines = (AyantDroitCommentaireInline,)
@@ -151,6 +152,7 @@ class CommentaireAdmin(admin.ModelAdmin):
 
 
 class ContratAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
+    alphabet_filter = 'dossier__employe__nom'
     search_fields = ('dossier__employe__nom', 'dossier__employe__prenom', 'dossier__poste__nom', 'dossier__poste__nom_feminin', )
     list_display = ('id', 'dossier', '_poste', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + (
@@ -159,6 +161,10 @@ class ContratAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
         }),
     )
 
+    def lookup_allowed(self, key, value):
+        if key in ('dossier__employe__nom__istartswith',  ):
+            return True
+
     def _poste(self, obj):
         return obj.dossier.poste
     _poste.short_description = "Poste"
@@ -173,6 +179,7 @@ class DeviseAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
 
 
 class DossierAdmin(AUFMetadataAdminMixin, admin.ModelAdmin,):
+    alphabet_filter = 'employe__nom'
     search_fields = ('employe__nom', 'employe__prenom', 'poste__nom', 'poste__nom_feminin')
     list_display = ('_employe', '_poste', 'date_debut', 'date_fin', )
     inlines = (DossierPieceInline, ContratInline,
@@ -195,6 +202,11 @@ class DossierAdmin(AUFMetadataAdminMixin, admin.ModelAdmin,):
         }),
     )
 
+    def lookup_allowed(self, key, value):
+        if key in ('employe__nom__istartswith',  ):
+            return True
+
+
     def _poste(self, dossier):
         return unicode(dossier.poste.nom)
     _poste.short_description = u'Poste'
@@ -222,7 +234,6 @@ class DossierCommentaireAdmin(admin.ModelAdmin):
 
 class EmployeAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     alphabet_filter = 'nom'
-    DEFAULT_ALPHABET = u'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
     search_fields = ('id', 'nom', 'prenom', 'nom_affichage', )
     inlines = (AyantDroitInline,
                DossierROInline,
@@ -286,6 +297,7 @@ class OrganismeBstgAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
 
 
 class PosteAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
+    alphabet_filter = 'nom'
     search_fields = ('nom', 'implantation__code', 'implantation__nom', 'implantation__region__code', 'implantation__region__nom', )
     list_display = ('nom', 'implantation', 'service', 'type_poste', 'date_debut', 'date_fin', )
     fieldsets = AUFMetadataAdminMixin.fieldsets + (