newplan phase 2

backend/igny8_core/modules/writer/admin.py

@@ -1,6 +1,12 @@
 from django.contrib import admin
 from django.contrib import messages
 from unfold.admin import ModelAdmin, TabularInline
+from unfold.contrib.filters.admin import (
+    RangeDateFilter,
+    RangeNumericFilter,
+    RelatedDropdownFilter,
+    ChoicesDropdownFilter,
+)
 from igny8_core.admin.base import SiteSectorAdminMixin
 from .models import Tasks, Images, Content
 from igny8_core.business.content.models import ContentTaxonomy, ContentAttribute, ContentTaxonomyRelation, ContentClusterMap
@@ -30,7 +36,15 @@ class TaskResource(resources.ModelResource):
 class TasksAdmin(ExportMixin, SiteSectorAdminMixin, ModelAdmin):
     resource_class = TaskResource
     list_display = ['title', 'content_type', 'content_structure', 'site', 'sector', 'status', 'cluster', 'created_at']
-    list_filter = ['status', 'content_type', 'content_structure', 'site', 'sector', 'cluster']
+    list_filter = [
+        ('status', ChoicesDropdownFilter),
+        ('content_type', ChoicesDropdownFilter),
+        ('content_structure', ChoicesDropdownFilter),
+        ('site', RelatedDropdownFilter),
+        ('sector', RelatedDropdownFilter),
+        ('cluster', RelatedDropdownFilter),
+        ('created_at', RangeDateFilter),
+    ]
     search_fields = ['title', 'description']
     ordering = ['-created_at']
     readonly_fields = ['created_at', 'updated_at']
@@ -186,9 +200,19 @@ class ContentResource(resources.ModelResource):
 @admin.register(Content)
 class ContentAdmin(ExportMixin, SiteSectorAdminMixin, ModelAdmin):
     resource_class = ContentResource
-    list_display = ['title', 'content_type', 'content_structure', 'site', 'sector', 'source', 'status', 'get_taxonomy_count', 'created_at']
-    list_filter = ['content_type', 'content_structure', 'source', 'status', 'site', 'sector', 'created_at']
-    search_fields = ['title', 'content_html', 'external_url']
+    list_display = ['title', 'content_type', 'content_structure', 'site', 'sector', 'source', 'status', 'word_count', 'get_taxonomy_count', 'created_at']
+    list_filter = [
+        ('status', ChoicesDropdownFilter),
+        ('content_type', ChoicesDropdownFilter),
+        ('content_structure', ChoicesDropdownFilter),
+        ('source', ChoicesDropdownFilter),
+        ('site', RelatedDropdownFilter),
+        ('sector', RelatedDropdownFilter),
+        ('cluster', RelatedDropdownFilter),
+        ('word_count', RangeNumericFilter),
+        ('created_at', RangeDateFilter),
+    ]
+    search_fields = ['title', 'content_html', 'external_url', 'meta_title', 'primary_keyword']
     ordering = ['-created_at']
     readonly_fields = ['created_at', 'updated_at', 'word_count', 'get_tags_display', 'get_categories_display']
     autocomplete_fields = ['cluster', 'site', 'sector']