mirror of
https://github.com/jazzband/django-admin2.git
synced 2026-05-18 12:11:13 +00:00
Implements model save options, issue #110
This commit is contained in:
parent
b0abe58121
commit
c6c44bbdd0
3 changed files with 44 additions and 3 deletions
|
|
@ -5,7 +5,9 @@
|
||||||
<form method="post">
|
<form method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form.as_p }}
|
{{ form.as_p }}
|
||||||
<input type="submit"/>
|
<button class="btn btn-small" type="submit" name="_addanother">Save and add another</button>
|
||||||
|
<button class="btn btn-small" type="submit" name="_continue">Save and continue editing</button>
|
||||||
|
<button class="btn btn-small btn-success" type="submit" name="_save">Save</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
|
|
|
||||||
|
|
@ -121,12 +121,23 @@ class ModelEditFormView(AdminModel2Mixin, generic.UpdateView):
|
||||||
|
|
||||||
class ModelAddFormView(AdminModel2Mixin, generic.CreateView):
|
class ModelAddFormView(AdminModel2Mixin, generic.CreateView):
|
||||||
form_class = None
|
form_class = None
|
||||||
success_url = "../"
|
|
||||||
default_template_name = "model_add_form.html"
|
default_template_name = "model_add_form.html"
|
||||||
permission_type = 'add'
|
permission_type = 'add'
|
||||||
|
|
||||||
def get_success_url(self):
|
def get_success_url(self):
|
||||||
view_name = 'admin2:{}_{}_detail'.format(self.app_label, self.model_name)
|
if '_continue' in self.request.POST:
|
||||||
|
view_name = 'admin2:{}_{}_update'.format(self.app_label,
|
||||||
|
self.model_name)
|
||||||
|
return reverse(view_name, kwargs={'pk': self.object.pk})
|
||||||
|
|
||||||
|
if '_addanother' in self.request.POST:
|
||||||
|
view_name = 'admin2:{}_{}_create'.format(self.app_label,
|
||||||
|
self.model_name)
|
||||||
|
return reverse(view_name)
|
||||||
|
|
||||||
|
# default to detail view
|
||||||
|
view_name = 'admin2:{}_{}_detail'.format(self.app_label,
|
||||||
|
self.model_name)
|
||||||
return reverse(view_name, kwargs={'pk': self.object.pk})
|
return reverse(view_name, kwargs={'pk': self.object.pk})
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,34 @@ class PostCreateViewTest(BaseIntegrationTest):
|
||||||
self.assertRedirects(response, reverse("admin2:blog_post_detail",
|
self.assertRedirects(response, reverse("admin2:blog_post_detail",
|
||||||
args=(post.pk, )))
|
args=(post.pk, )))
|
||||||
|
|
||||||
|
def test_save_and_add_another_redirects_to_create(self):
|
||||||
|
"""
|
||||||
|
Tests that choosing 'Save and add another' from the model create
|
||||||
|
page redirects the user to the model create page.
|
||||||
|
"""
|
||||||
|
post_data = {"title": "a_post_title",
|
||||||
|
"body": "a_post_body",
|
||||||
|
"_addanother": ""}
|
||||||
|
self.client.login(username='admin', password='password')
|
||||||
|
response = self.client.post(reverse("admin2:blog_post_create"),
|
||||||
|
post_data)
|
||||||
|
post = Post.objects.get(title='a_post_title')
|
||||||
|
self.assertRedirects(response, reverse("admin2:blog_post_create"))
|
||||||
|
|
||||||
|
def test_save_and_continue_editing_redirects_to_update(self):
|
||||||
|
"""
|
||||||
|
Tests that choosing "Save and continue editing" redirects
|
||||||
|
the user to the model update form.
|
||||||
|
"""
|
||||||
|
post_data = {"title": "Unique",
|
||||||
|
"body": "a_post_body",
|
||||||
|
"_continue": ""}
|
||||||
|
response = self.client.post(reverse("admin2:blog_post_create"),
|
||||||
|
post_data)
|
||||||
|
post = Post.objects.get(title="Unique")
|
||||||
|
self.assertRedirects(response, reverse("admin2:blog_post_update",
|
||||||
|
args=(post.pk, )))
|
||||||
|
|
||||||
|
|
||||||
class PostDeleteViewTest(BaseIntegrationTest):
|
class PostDeleteViewTest(BaseIntegrationTest):
|
||||||
def test_view_ok(self):
|
def test_view_ok(self):
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue