diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/views.py | 15 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 7 |
2 files changed, 15 insertions, 7 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index cb1af7c5d..6ae0c1f3b 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -823,17 +823,21 @@ def autocomplete_author(request): return HttpResponse(data, content_type='text/plain') -new_person = new_qa_item(models.Person, forms.PersonForm) +new_person = new_qa_item(models.Person, forms.PersonForm, + page_name=_("New person")) modify_person = modify_qa_item(models.Person, forms.PersonForm) detail_person = get_short_html_detail(models.Person) -new_person_noorga = new_qa_item(models.Person, forms.NoOrgaPersonForm) -new_organization = new_qa_item(models.Organization, forms.OrganizationForm) +new_person_noorga = new_qa_item(models.Person, forms.NoOrgaPersonForm, + page_name=_("New person")) +new_organization = new_qa_item(models.Organization, forms.OrganizationForm, + page_name=_("New organization")) show_organization = show_item(models.Organization, 'organization') get_organization = get_item(models.Organization, 'get_organization', 'organization') modify_organization = modify_qa_item(models.Organization, forms.OrganizationForm) detail_organization = get_short_html_detail(models.Organization) -new_author = new_qa_item(models.Author, forms.AuthorForm) +new_author = new_qa_item(models.Author, forms.AuthorForm, + page_name=_("New author")) show_person = show_item(models.Person, 'person') get_person = get_item(models.Person, 'get_person', 'person') @@ -1922,7 +1926,8 @@ class OrganizationPersonEdit(LoginRequiredMixin, UpdateView): # documents -new_document_tag = new_qa_item(models.DocumentTag, forms.AddDocumentTagForm) +new_document_tag = new_qa_item(models.DocumentTag, forms.AddDocumentTagForm, + page_name=_("New tag")) autocomplete_documenttag = get_autocomplete_generic(models.DocumentTag) show_document = show_item(models.Document, 'document') diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index e0861c7b8..677dcbe18 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -144,7 +144,7 @@ def check_permission(request, action_slug, obj_id=None): def new_qa_item(model, frm, many=False, - template="ishtar/forms/qa_new_item.html"): + template="ishtar/forms/qa_new_item.html", page_name=""): def func(request, parent_name, limits=''): model_name = model._meta.object_name not_permitted_msg = ugettext("Operation not permitted.") @@ -154,7 +154,10 @@ def new_qa_item(model, frm, many=False, if model.SLUG == "site": slug = "archaeologicalsite" url_slug = "new-" + slug - dct = {'page_name': str(_('New %s' % model_name.lower())), + current_page_name = page_name[:] + if not current_page_name: + current_page_name = _('New %s' % model_name.lower()) + dct = {'page_name': str(current_page_name), 'url': reverse(url_slug, args=[parent_name]), 'slug': slug, 'parent_name': parent_name, |