Merge pull request #102 from SRJ9/SRJ9/m2m-apply

passing m2m param to api.merge in apply step
saxix · Jan 10, 2017 · 291d8cb · 291d8cb
2 parents e50e74d + 734d30b
commit 291d8cb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/adminactions/merge.py b/src/adminactions/merge.py
@@ -137,10 +137,12 @@ def raw_widget(field, **kwargs):
         if ok:
             if form.cleaned_data['dependencies'] == MergeForm.DEP_MOVE:
                 related = api.ALL_FIELDS
+                m2m = api.ALL_FIELDS
             else:
                 related = None
+                m2m = None
             fields = form.cleaned_data['field_names']
-            api.merge(master, other, fields=fields, commit=True, related=related)
+            api.merge(master, other, fields=fields, commit=True, m2m=m2m, related=related)
             return HttpResponseRedirect(request.path)
         else:
             messages.error(request, form.errors)