diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-21 22:37:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-21 22:37:51 +0200 |
| commit | f8a59f8ee688220661890bb71733476eaa7f8a53 (patch) | |
| tree | 0254b160ab0b9f0987c0fa0cf07380f76d43b48c /ishtar_common | |
| parent | a854fb0090f0deb674e83011c45a2e6c4ff0caee (diff) | |
| parent | 2e76aa8d77164a80f28edf4cfe8fee2c1e267c86 (diff) | |
| download | Ishtar-1.0.tar.bz2 Ishtar-1.0.zip | |
Merge branch 'master' into v1.0v1.0
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/locale/django.pot | 23 | ||||
| -rw-r--r-- | ishtar_common/views.py | 2 |
2 files changed, 11 insertions, 14 deletions
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index c43a1e9ae..252f5ea64 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -184,7 +184,6 @@ msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 #: forms_common.py:408 models.py:1624 models.py:3089 #: templates/blocks/JQueryAdvancedTown.html:19 -#: templates/ishtar/sheet_organization.html:13 msgid "Town" msgstr "" @@ -221,7 +220,7 @@ msgstr "" #: models.py:2675 models.py:3075 models.py:3172 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 -#: templates/ishtar/sheet_organization.html:21 +#: templates/ishtar/sheet_organization.html:18 msgid "Name" msgstr "" @@ -230,17 +229,15 @@ msgid "Organization type" msgstr "" #: forms_common.py:178 forms_common.py:402 models.py:1619 -#: templates/ishtar/sheet_organization.html:10 +#: templates/ishtar/blocks/sheet_address_section.html:3 msgid "Address" msgstr "" #: forms_common.py:180 forms_common.py:405 models.py:1620 -#: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" #: forms_common.py:182 forms_common.py:406 models.py:1622 -#: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" @@ -254,14 +251,14 @@ msgid "Email" msgstr "" #: forms_common.py:188 forms_common.py:385 models.py:1637 -#: templates/ishtar/sheet_organization.html:14 +#: templates/ishtar/sheet_organization.html:11 #: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" #: forms_common.py:189 forms_common.py:394 models.py:1649 -#: templates/ishtar/sheet_organization.html:15 +#: templates/ishtar/sheet_organization.html:12 #: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" @@ -271,7 +268,7 @@ msgstr "" #: models.py:2568 models.py:3010 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 -#: templates/ishtar/sheet_organization.html:23 +#: templates/ishtar/sheet_organization.html:20 #: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Type" msgstr "" @@ -293,7 +290,7 @@ msgid "Organization to merge" msgstr "" #: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2673 -#: templates/ishtar/sheet_organization.html:22 +#: templates/ishtar/sheet_organization.html:19 msgid "Surname" msgstr "" @@ -2307,19 +2304,19 @@ msgstr "" msgid "Created by:" msgstr "" -#: templates/ishtar/sheet_organization.html:19 +#: templates/ishtar/sheet_organization.html:16 msgid "Person in the organization" msgstr "" -#: templates/ishtar/sheet_organization.html:34 +#: templates/ishtar/sheet_organization.html:31 msgid "No person in this organization" msgstr "" -#: templates/ishtar/sheet_organization.html:38 +#: templates/ishtar/sheet_organization.html:35 msgid "General contractor organization of archaeological files" msgstr "" -#: templates/ishtar/sheet_organization.html:43 +#: templates/ishtar/sheet_organization.html:40 msgid "Planning service of archaeological files" msgstr "" diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 86c87d049..234dcd826 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -734,7 +734,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], model.objects.get(pk=dct["pk"])) except model.DoesNotExist: pass - elif dct == (base_request or {}): + elif dct == (my_base_request or {}): # a parent item may be selected in the default menu for name, key in my_relative_session_names: if name in request.session and request.session[name] \ |