more tagulous select field fixes

Author: valentijnscholten

dojo/filters.py

@@ -343,32 +343,35 @@ def __init__(self, *args, **kwargs):
         for field in ["tags", "test__tags", "test__engagement__tags", "test__engagement__product__tags",
                         "not_tags", "not_test__tags", "not_test__engagement__tags", "not_test__engagement__product__tags"]:
             if field in self.form.fields:
-                # Remove the original filter field to prevent duplication
-                if field in self.filters:
-                    tags_filter = self.filters[field]
-                    model = tags_filter.model
-                else:
-                    # Fallback to the 'tags' filter if specific field filter doesn't exist
-                    tags_filter = self.filters["tags"]
-                    model = tags_filter.model
+                # Don't delete filters - django-filters needs them for queryset processing
+                # We only replace the form field to use tagulous instead of ModelMultipleChoiceFilter
 
-                # Get the tagulous field from the model
-                tagulous_field = model._meta.get_field("tags").formfield()
+                # Get the correct model for this specific field
+                tagged_model, exclude = get_tags_model_from_field_name(field)
+                if tagged_model:
+                    # Use the specific model for this field (e.g., Test for test__tags, Engagement for test__engagement__tags)
+                    tagulous_field = tagged_model._meta.get_field("tags").formfield()
+                # Fall back to the main model's tags field for the basic "tags" field
+                elif "tags" in self.filters:
+                    main_model = self.filters["tags"].model
+                    tagulous_field = main_model._meta.get_field("tags").formfield()
+                else:
+                    continue  # Skip this field if no model available
 
-                # we defer applying the select2 autocomplete because there can be multiple forms on the same page
-                # and form.js would then apply select2 multiple times, resulting in duplicated fields
-                # the initialization now happens in filter_js_snippet.html
-                tagulous_field.widget.tag_options += tagulous.models.options.TagOptions(autocomplete_settings={"width": "200px", "defer": True})
+                # Remove defer to prevent timing issues that cause field duplication
+                # Let tagulous initialize normally instead of deferring to filter_js_snippet.html
+                tagulous_field.widget.tag_options += tagulous.models.options.TagOptions(autocomplete_settings={"width": "200px", "defer": False})
 
-                tagged_model, exclude = get_tags_model_from_field_name(field)
+                # Set the label and autocomplete tags for the field
                 if tagged_model:  # only if not the normal tags field
                     tagulous_field.label = get_tags_label_from_model(tagged_model)
-                    tagulous_field.autocomplete_tags = tagged_model.tags.tag_model.objects.all().order_by("name")
+                    # Set autocomplete_tags to the correct model's tags
+                    tagulous_field.autocomplete_tags = tagged_model.tags.tag_model.objects.all().distinct().order_by("name")
 
                 if exclude:
                     tagulous_field.label = "Not " + tagulous_field.label
 
-                # Replace the field completely
+                # Replace the field completely in the form
                 self.form.fields[field] = tagulous_field
 
 

dojo/templates/base.html

@@ -1219,7 +1219,7 @@ <h4 class="modal-title" id="sessionModalLabel">Session Expiring Soon</h4>
                     <!-- 'no_results_text': "Tag not found, press TAB key to add.", -->
                 <!-- }); -->
 
-                $('select').not('#notification-scope').addClass('selectpicker');
+                $('select').not('#notification-scope').not('[data-tagulous]').not('.tagulous-select').addClass('selectpicker');
                 $('.selectpicker').attr('data-live-search', 'true');
                 $('.selectpicker').attr('data-container', 'body');
                 $('.selectpicker').css('width', '70%');

dojo/templates/dojo/filter_js_snippet.html

@@ -14,9 +14,8 @@
                 $(this).select2(
                 )
             })
-            $('input[data-tagulous]').each(function () {
-                Tagulous.select2($(this))
-            })
+            // Tagulous initialization now handled automatically by the field (defer=False)
+            // No manual initialization needed to prevent double initialization
         })