From 847d0ee78f1241aa342946316069ad07ea4fa7a2 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Sat, 6 Jul 2013 16:39:42 +0200 Subject: [PATCH] Add an action_name context variable to model form views --- .../templates/djadmin2/bootstrap/model_update_form.html | 6 +++--- djadmin2/views.py | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html index 52c7f7f..815bc57 100644 --- a/djadmin2/templates/djadmin2/bootstrap/model_update_form.html +++ b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html @@ -2,9 +2,9 @@ {% load admin2_tags i18n %} -{% block title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock title %} +{% block title %}{% blocktrans with action=action model_name=model_name %}{{ action_name }} {{ model_name }}{% endblocktrans %}{% endblock title %} -{% block page_title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock page_title %} +{% block page_title %}{% blocktrans with action=action model_name=model_name %}{{ action_name }} {{ model_name }}{% endblocktrans %}{% endblock page_title %} {% block breadcrumbs %}
  • @@ -20,7 +20,7 @@ /
  • {% if action == 'Add' %} -
  • {{ action }}
  • +
  • {{ action_name }}
  • {% else %}
  • {{ object }} diff --git a/djadmin2/views.py b/djadmin2/views.py index 1390a7d..97297ed 100644 --- a/djadmin2/views.py +++ b/djadmin2/views.py @@ -179,7 +179,8 @@ class ModelEditFormView(AdminModel2Mixin, Admin2ModelFormMixin, extra_views.Upda def get_context_data(self, **kwargs): context = super(ModelEditFormView, self).get_context_data(**kwargs) context['model'] = self.get_model() - context['action'] = ugettext_lazy("Change") + context['action'] = "Change" + context['action_name'] = ugettext_lazy("Change") return context @@ -199,7 +200,8 @@ class ModelAddFormView(AdminModel2Mixin, Admin2ModelFormMixin, extra_views.Creat def get_context_data(self, **kwargs): context = super(ModelAddFormView, self).get_context_data(**kwargs) context['model'] = self.get_model() - context['action'] = ugettext_lazy("Add") + context['action'] = "Add" + context['action_name'] = ugettext_lazy("Add") return context