Merge pull request #22 from sergio971st/admin_filtration

added admin filter for subdomains in MetaTagPath and MetaTagView
whyflyru · Feb 3, 2020 · f200eab · f200eab
2 parents 9c39fda + a630c45
commit f200eab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/djangoseo/admin.py b/djangoseo/admin.py
@@ -80,7 +80,7 @@ def get_view_admin(use_site=False, use_subdomains=False):
     })
 
 
-def register_seo_admin(admin_site, metadata_class):
+def register_seo_admin(admin_site, metadata_class, filter_list=None):
     """ Register the backends specified in Meta.backends with the admin """
     use_sites = metadata_class._meta.use_sites
     use_subdomains = metadata_class._meta.use_subdomains
@@ -100,27 +100,35 @@ def get_list_display():
         class ModelAdmin(model_admin):
             form = get_model_form(metadata_class)
             list_display = model_admin.list_display + get_list_display()
+            if filter_list:  # Cannot give the filter_list variable name 'list_filter', because there is a name conflict
+                list_filter = filter_list
 
         _register_admin(admin_site, metadata_class._meta.get_model('model'), ModelAdmin)
 
     if 'view' in backends:
         class ViewAdmin(view_admin):
             form = get_view_form(metadata_class)
             list_display = view_admin.list_display + get_list_display()
+            if filter_list:  # Cannot give the filter_list variable name 'list_filter', because there is a name conflict
+                list_filter = filter_list
 
         _register_admin(admin_site, metadata_class._meta.get_model('view'), ViewAdmin)
 
     if 'path' in backends:
         class PathAdmin(path_admin):
             form = get_path_form(metadata_class)
             list_display = path_admin.list_display + get_list_display()
+            if filter_list:  # Cannot give the filter_list variable name 'list_filter', because there is a name conflict
+                list_filter = filter_list
 
         _register_admin(admin_site, metadata_class._meta.get_model('path'), PathAdmin)
 
     if 'modelinstance' in backends:
         class ModelInstanceAdmin(model_instance_admin):
             form = get_modelinstance_form(metadata_class)
             list_display = model_instance_admin.list_display + get_list_display()
+            if filter_list:  # Cannot give the filter_list variable name 'list_filter', because there is a name conflict
+                list_filter = filter_list
 
         _register_admin(admin_site, metadata_class._meta.get_model('modelinstance'), ModelInstanceAdmin)
 

diff --git a/tests/userapp/admin.py b/tests/userapp/admin.py
@@ -12,7 +12,7 @@ class WithMetadataAdmin(admin.ModelAdmin):
     inlines = [get_inline(Coverage), get_inline(WithSites)]
 
 
-register_seo_admin(admin.site, Coverage)
+register_seo_admin(admin.site, Coverage, ('title', ))
 register_seo_admin(admin.site, WithSites)
 
 try: