class RepertoireSearchForm (forms.Form):
- #mots_cles = forms.CharField (required = False, label="Mots-clés")
- discipline = forms.ModelChoiceField(queryset=Discipline.objects.all(), required=False, label="Champ disciplinaire", empty_label="Tous")
+ mots_cles = forms.CharField (required = False, label="Mots-clés")
+ discipline = forms.ModelChoiceField(queryset=Discipline.objects.all(), required=False, label="Discipline", empty_label="Tous")
fonction = forms.ChoiceField(choices=(('','Tous'),)+FONCTION_CHOICES, required=False, label="Fonction")
pays = forms.ModelChoiceField(queryset=Pays.objects.all().order_by("nom"), required=False, label="Localisation", empty_label="Tous")
- genre = forms.ChoiceField(choices=(('','Tous'),)+GENRE_CHOICES, required=False, label="Sexe")
+ genre = forms.ChoiceField(choices=(('','Tous'),)+GENRE_CHOICES, required=False, label="Genre")
from django.contrib.auth.decorators import login_required
+from django.db.models import Q
+
def chercheur_queryset (request):
list = Chercheur.objects.order_by("id")
pays = ""
discipline = simpleForm.cleaned_data["discipline"]
if discipline:
list = list.filter (discipline=discipline)
- #mots_cles = simpleForm.cleaned_data["mots_cles"]
- #if mots_cles:
- # list = list.filter (personne__nom__icontains=mots_cles)
+ mots_cles = simpleForm.cleaned_data["mots_cles"]
+ if mots_cles:
+ list = list.filter (Q(personne__nom__icontains=mots_cles) | Q(personne__prenom__icontains=mots_cles))
return list
def index(request):