Addressing PR comments

- Updated the success message to user
- cleaned up some print statements
- updated the form max_length to match the taggit model
- updated the form html to extend the base so the styling matched

taggit/admin.py

@@ -62,17 +62,16 @@ def merge_tags_view(self, request):
                             TaggedItem.objects.filter(tag=tag).update(tag=new_tag)
                         # tag.delete()  #this will delete the selected tags after merge...leaving out for now
 
-                self.message_user(request, "Tags have been merged")
+                self.message_user(request, "Tags have been merged", level="success")
                 # clear the selected_tag_ids from session after merge is complete
                 request.session.pop("selected_tag_ids", None)
+
                 return redirect("..")
             else:
-                print(f"Form errors: {form.errors}")
                 self.message_user(request, "Form is invalid.", level="error")
 
         context = {
             "form": MergeTagsForm(),
             "selected_tag_ids": selected_tag_ids,
         }
-
         return render(request, "admin/taggit/merge_tags_form.html", context)

taggit/forms.py

@@ -57,6 +57,6 @@ def has_changed(self, initial_value, data_value):
 class MergeTagsForm(forms.Form):
     new_tag_name = forms.CharField(
         label="New Tag Name",
-        max_length=255,
+        max_length=100,
         widget=forms.TextInput(attrs={"id": "id_new_tag_name"}),
     )

taggit/templates/admin/taggit/merge_tags_form.html

@@ -1,3 +1,4 @@
+{% extends "admin/base.html" %} {% block content %}
 <div id="mergeTagsModal">
   <div>
     <div>
@@ -20,10 +21,11 @@
           {% endfor %}
 
           <div>
-            <button type="submit" class="btn btn-primary">Merge Tags</button>
+            <input type="submit" class="btn btn-primary"></input>
           </div>
         </form>
       </div>
     </div>
   </div>
 </div>
+{% endblock %}