Ressources: Ajout du champ catégorie pour la recherche

diff --git a/auf_savoirs_en_partage/savoirs/forms.py b/auf_savoirs_en_partage/savoirs/forms.py
index 52ac747..c5699bb 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/forms.py
+++ b/auf_savoirs_en_partage/savoirs/forms.py
@@ -57,7 +57,7 @@ class RessourceSearchForm(forms.ModelForm):
 
     class Meta:
         model = RessourceSearch
-        fields = ['q', 'auteur', 'titre', 'sujet', 'publisher', 'discipline', 'region']
+        fields = ['q', 'auteur', 'titre', 'sujet', 'publisher', 'categorie', 'discipline', 'region']
 
 class RessourceSearchEditForm(RessourceSearchForm):
     """Formulaire d'édition de recherche sauvegardée."""

diff --git a/auf_savoirs_en_partage/savoirs/models.py b/auf_savoirs_en_partage/savoirs/models.py
index cf850c5..8f473f7 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/models.py
+++ b/auf_savoirs_en_partage/savoirs/models.py
@@ -941,6 +941,7 @@ class RessourceSearch(Search):
     titre = models.CharField(max_length=100, blank=True)
     sujet = models.CharField(max_length=100, blank=True)
     publisher = models.CharField(max_length=100, blank=True, verbose_name="éditeur")
+    categorie = models.ForeignKey(RecordCategorie, blank=True, null=True, verbose_name='catégorie')
 
     class Meta:
         verbose_name = 'recherche de ressources'
@@ -958,6 +959,8 @@ class RessourceSearch(Search):
             results = results.add_to_query('@subject ' + self.sujet)
         if self.publisher:
             results = results.add_to_query('@publisher ' + self.publisher)
+        if self.categorie:
+            results = results.add_to_query('@categorie %s' % self.categorie.id)
         if self.discipline:
             results = results.filter_discipline(self.discipline)
         if self.region:

diff --git a/auf_savoirs_en_partage/scripts/sphinx.conf.py.in b/auf_savoirs_en_partage/scripts/sphinx.conf.py.in
index 9d7c155..7931d7f 100644 (file)
--- a/auf_savoirs_en_partage/scripts/sphinx.conf.py.in
+++ b/auf_savoirs_en_partage/scripts/sphinx.conf.py.in
@@ -92,6 +92,7 @@ emit_source('savoirsenpartage_ressources',
                       r.contributor AS contributor, 
                       r.subject AS subject, 
                       r.publisher AS publisher, 
+                      r.categorie_id as categorie,
                       TO_DAYS(r.modified) AS modified,
                       GROUP_CONCAT(DISTINCT d.nom_discipline) AS disciplines, 
                       GROUP_CONCAT(DISTINCT d.id_discipline) AS discipline_ids,