fix merge

merwok · merwok · commit 2b06f62642fe · 2022-12-01T13:44:46.000-05:00
diff --git a/admin_interface/templatetags/admin_interface_tags.py b/admin_interface/templatetags/admin_interface_tags.py
@@ -122,7 +122,7 @@ def admin_interface_filter_removal_link(changelist, list_filter):
     )
 
 
-@simple_tag()
+@register.simple_tag()
 def admin_interface_use_changeform_tabs(adminform, inline_forms):
     theme = get_admin_interface_theme()
     has_fieldset_tabs = theme.show_fieldsets_as_tabs and len(adminform.fieldsets) > 1

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ def admin_interface_filter_removal_link(changelist, list_filter):`
`122`	`122`	`)`
`123`	`123`
`124`	`124`
`125`		`-@simple_tag()`
	`125`	`+@register.simple_tag()`
`126`	`126`	`def admin_interface_use_changeform_tabs(adminform, inline_forms):`
`127`	`127`	`theme = get_admin_interface_theme()`
`128`	`128`	`has_fieldset_tabs = theme.show_fieldsets_as_tabs and len(adminform.fieldsets) > 1`