diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-09-27 17:13:44 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-09-27 17:18:20 +0200 |
| commit | cf8a4d5f0d3b911f3456a3a53a99d15e86b0508b (patch) | |
| tree | 6036ccfb226f94417ebc292c7d6cfe445cf4fdd4 /ishtar_common/templates/ishtar/merge_person.html | |
| parent | b9cfeb35957ae9dfca1d39de1e86547074b483be (diff) | |
| download | Ishtar-cf8a4d5f0d3b911f3456a3a53a99d15e86b0508b.tar.bz2 Ishtar-cf8a4d5f0d3b911f3456a3a53a99d15e86b0508b.zip | |
Merge page - add more fields on table (refs #5447)
Diffstat (limited to 'ishtar_common/templates/ishtar/merge_person.html')
| -rw-r--r-- | ishtar_common/templates/ishtar/merge_person.html | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html index 0d03112c5..bb80a5645 100644 --- a/ishtar_common/templates/ishtar/merge_person.html +++ b/ishtar_common/templates/ishtar/merge_person.html @@ -1,4 +1,4 @@ -{% extends "ishtar/merge.html" %} +{% extends "ishtar/merge.html" %}{% load i18n %} {% block merge_field_row %} {% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %} <tr> @@ -6,15 +6,25 @@ <a href="#" onclick="load_window('{% url 'show-person' form.instance.from_person.pk '' %}', 'person');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a> </td> <td> - {{form.instance.from_person}} ({{form.instance.from_person.pk}})<br/> - {{form.instance.from_person.address_lbl|linebreaksbr}} + <span title="{% trans 'Raw name' %}">{{form.instance.from_person.raw_name}}</span> ({{form.instance.from_person.pk}})<br> + <span title="{% trans 'Title' %}">{{form.instance.from_person.title|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.from_person.name|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.from_person.surname|default:""}}</span><br> + {% if form.instance.from_person.attached_to %}<span title="{% trans 'Organization' %}">{{form.instance.from_person.attached_to}}</span><br>{% endif %} + {% if form.instance.from_person.salutation %}<span title="{% trans 'Salutation' %}">{{form.instance.from_person.salutation}}</span><br>{% endif %} + {% for value, title in form.instance.from_person.address_lbl_list %} + <span title="{{title}}">{{value}}</span>{% if not forloop.last %}<br>{% endif %} + {% endfor %} </td> <td> <a href="#" onclick="load_window('{% url 'show-person' form.instance.to_person.pk '' %}', 'person');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a> </td> <td> - {{form.instance.to_person}} ({{form.instance.to_person.pk}})<br/> - {{form.instance.to_person.address_lbl|linebreaksbr}} + <span title="{% trans 'Raw name' %}">{{form.instance.to_person.raw_name}}</span> ({{form.instance.to_person.pk}})<br> + <span title="{% trans 'Title' %}">{{form.instance.to_person.title|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.to_person.name|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.to_person.surname|default:""}}</span><br> + {% if form.instance.to_person.attached_to %}<span title="{% trans 'Organization' %}">{{form.instance.to_person.attached_to}}</span><br>{% endif %} + {% if form.instance.to_person.salutation %}<span title="{% trans 'Salutation' %}">{{form.instance.to_person.salutation}}</span><br>{% endif %} + {% for value, title in form.instance.to_person.address_lbl_list %} + <span title="{{title}}">{{value}}</span>{% if not forloop.last %}<br>{% endif %} + {% endfor %} </td> <td class='check'>{{form.b_is_duplicate_a}}</td> <td class='check'>{{form.a_is_duplicate_b}}</td> |