Merge pull request #7 from Skytek/dev

Improve forms: better layout and allow file uplaods
Skytek · Nov 18, 2023 · b65977f · b65977f
2 parents 6aa6790 + 7a73723
commit b65977f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 8 deletions.
diff --git a/django_object_actions/templates/django_object_actions/change_form.html b/django_object_actions/templates/django_object_actions/change_form.html
@@ -34,7 +34,7 @@
     {% if tool.has_inline_form %}
         {% url tools_view_name pk=object_id tool=tool.name as action_url %}
         <div class="clear">
-          <form name="{{ tool.name }}__form" method="post" action="{% add_preserved_filters action_url %}">
+          <form name="{{ tool.name }}__form" method="post" action="{% add_preserved_filters action_url %}" enctype="multipart/form-data">
             {% csrf_token %}
             <ul class="object-tools django-object-actions">
               {{ tool.form.as_ul }}

diff --git a/django_object_actions/templates/django_object_actions/change_list.html b/django_object_actions/templates/django_object_actions/change_list.html
@@ -34,7 +34,7 @@
     {% if tool.has_inline_form %}
         {% url tools_view_name tool=tool.name as action_url %}
         <div class="clear">
-          <form name="{{ tool.name }}__form" method="post" action="{% add_preserved_filters action_url %}">
+          <form name="{{ tool.name }}__form" method="post" action="{% add_preserved_filters action_url %}" enctype="multipart/form-data">
             {% csrf_token %}
             <ul class="object-tools django-object-actions">
               {{ tool.form.as_ul }}

diff --git a/django_object_actions/templates/django_object_actions/modal_form.html b/django_object_actions/templates/django_object_actions/modal_form.html
@@ -3,9 +3,9 @@
 
 {% block content %}
 <div id="content-main">
-    <form name="{{ tool.name }}__form" method="post" action="{% add_preserved_filters action_url %}">
+    <form name="{{ tool.name }}__form" method="post" action="{% add_preserved_filters action_url %}" enctype="multipart/form-data">
         {% csrf_token %}
-        {{ form.as_table }}
+        {{ form.as_p }}
         <div>
             <input type="submit" value="Submit" name="modal_submit">
             <input type="submit" value="Cancel" name="modal_cancel">

diff --git a/example_project/polls/admin.py b/example_project/polls/admin.py
@@ -174,7 +174,6 @@ def get_change_actions(self, request, object_id, form_url):
 
 
 class CommentAdmin(DjangoObjectActions, admin.ModelAdmin):
-
     # Object actions
     ################
 
@@ -192,7 +191,6 @@ def hodor(self, request, obj):
 
 
 class RelatedDataAdmin(DjangoObjectActions, admin.ModelAdmin):
-
     # Object actions
     ################
 

diff --git a/example_project/polls/migrations/0001_initial.py b/example_project/polls/migrations/0001_initial.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

diff --git a/example_project/polls/migrations/0002_auto_20200805_0239.py b/example_project/polls/migrations/0002_auto_20200805_0239.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("polls", "0001_initial"),
     ]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,7 +7,6 @@


		class Migration(migrations.Migration):

		initial = True

		dependencies = []
Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
     class Migration(migrations.Migration):
         dependencies = [
             ("polls", "0001_initial"),
         ]
@@ Expand Down @@