diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-05-27 08:30:27 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-05-27 08:30:27 +0200 |
| commit | c568ea2d213877453f073e8570ec2585c8cc3018 (patch) | |
| tree | 3c74ff2345a4afa7699d91e09b68b4d168d778af /archaeological_operations | |
| parent | 3afbba402b5ddfe2f3e5357292a5488ff1bc6de7 (diff) | |
| download | Ishtar-c568ea2d213877453f073e8570ec2585c8cc3018.tar.bz2 Ishtar-c568ea2d213877453f073e8570ec2585c8cc3018.zip | |
OA prefix: fix customize on sheet, form and save
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/templates/ishtar/blocks/OAWidget.html | 6 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 2 | ||||
| -rw-r--r-- | archaeological_operations/widgets.py | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/archaeological_operations/templates/ishtar/blocks/OAWidget.html b/archaeological_operations/templates/ishtar/blocks/OAWidget.html index 6f4c1af24..58744daa6 100644 --- a/archaeological_operations/templates/ishtar/blocks/OAWidget.html +++ b/archaeological_operations/templates/ishtar/blocks/OAWidget.html @@ -1,6 +1,6 @@ <div class="input-group"> - <div class="input-group-prepend"> - <div class="input-group-text">OA</div> - </div> + {% if oa_prefix %}<div class="input-group-prepend"> + <div class="input-group-text">{{oa_prefix}}</div> + </div>{% endif %} <input class="form-control widget-oa" type="text"{{final_attrs|safe}}> </div>
\ No newline at end of file diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index e3076d3e9..a7d0b7ecc 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -117,7 +117,7 @@ <div class="col main"> {% if item.year or item.operation_code %} {{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}<br> - {% if item.code_patriarche %}OA{{item.code_patriarche}}{% endif %} + {% if item.code_patriarche %}{% if PROFILE.operation_prefix %}{{PROFILE.operation_prefix}}{% endif %}{{item.code_patriarche}}{% endif %} {% if item.complete_identifier %}<p class="window-refs" title="{% trans 'Complete identifier' %}"> <strong>{{ item.complete_identifier }}</strong></p>{% endif %} diff --git a/archaeological_operations/widgets.py b/archaeological_operations/widgets.py index 1494d0c14..f2a2d3d66 100644 --- a/archaeological_operations/widgets.py +++ b/archaeological_operations/widgets.py @@ -22,7 +22,7 @@ from django.forms import widgets from django.forms.utils import flatatt from django.template import loader from django.utils.safestring import mark_safe -from ishtar_common.utils import ugettext_lazy as _ +from ishtar_common.utils import ugettext_lazy as _, get_current_profile class ParcelWidget(widgets.MultiWidget): @@ -67,10 +67,12 @@ class OAWidget(forms.TextInput): if not value: value = "" final_attrs = flatatt(self.build_attrs(attrs, {"name": name, "value": value})) + oa_prefix = get_current_profile(force=False).operation_prefix or "" dct = { "final_attrs": final_attrs, "id": attrs["id"], "safe_id": attrs["id"].replace("-", "_"), + "oa_prefix": oa_prefix } t = loader.get_template("ishtar/blocks/OAWidget.html") rendered = t.render(dct) |