Merge pull request sshwsfc#209 from the5fire/fix-editpatchview-form-not-work

Fix editpatchview form not work

Author: sshwsfc

xadmin/plugins/editable.py

@@ -1,4 +1,3 @@
-from django import forms
 from django import template
 from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
 from django.db import models, transaction
@@ -42,9 +41,9 @@ def result_item(self, item, obj, field_name, row):
 
             item.wraps.insert(0, '<span class="editable-field">%s</span>')
             item.btns.append((
-                '<a class="editable-handler" title="%s" data-editable-field="%s" data-editable-loadurl="%s">'+
+                '<a class="editable-handler" title="%s" data-editable-field="%s" data-editable-loadurl="%s">' +
                 '<i class="fa fa-edit"></i></a>') %
-                 (_(u"Enter %s") % field_label, field_name, self.admin_view.model_admin_url('patch', pk) + '?fields=' + field_name))
+                (_(u"Enter %s") % field_label, field_name, self.admin_view.model_admin_url('patch', pk) + '?fields=' + field_name))
 
             if field_name not in self.editable_need_fields:
                 self.editable_need_fields[field_name] = item.field
@@ -110,7 +109,7 @@ def get(self, request, object_id):
         model_fields = [f.name for f in self.opts.fields]
         fields = [f for f in request.GET['fields'].split(',') if f in model_fields]
         defaults = {
-            "form": forms.ModelForm,
+            "form": self.form,
             "fields": fields,
             "formfield_callback": self.formfield_for_dbfield,
         }
@@ -121,22 +120,21 @@ def get(self, request, object_id):
         helper.form_tag = False
         form.helper = helper
 
-        s = '{% load i18n crispy_forms_tags %}<form method="post" action="https://github.com/%7B%7Baction_url%7D%7D">{% crispy form %}'+ \
+        s = '{% load i18n crispy_forms_tags %}<form method="post" action="https://github.com/%7B%7Baction_url%7D%7D">{% crispy form %}' + \
             '<button type="submit" class="btn btn-success btn-block btn-sm">{% trans "Apply" %}</button></form>'
         t = template.Template(s)
-        c = template.Context({'form':form, 'action_url': self.model_admin_url('patch', self.org_obj.pk)})
+        c = template.Context({'form': form, 'action_url': self.model_admin_url('patch', self.org_obj.pk)})
 
         return HttpResponse(t.render(c))
 
-
     @filter_hook
     @csrf_protect_m
     @transaction.commit_on_success
     def post(self, request, object_id):
         model_fields = [f.name for f in self.opts.fields]
         fields = [f for f in request.POST.keys() if f in model_fields]
         defaults = {
-            "form": forms.ModelForm,
+            "form": self.form,
             "fields": fields,
             "formfield_callback": self.formfield_for_dbfield,
         }