From 492747e5a6098d302c95b938fd6b9ae52438681d Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 13 Jan 2016 13:01:06 +0100
Subject: Merge: display address for persons and organizations

---
 ishtar_common/templates/ishtar/merge_organization.html | 6 ++++--
 ishtar_common/templates/ishtar/merge_person.html       | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html
index 4118ee6d5..e4ca430a1 100644
--- a/ishtar_common/templates/ishtar/merge_organization.html
+++ b/ishtar_common/templates/ishtar/merge_organization.html
@@ -7,13 +7,15 @@
           <a href="#" onclick="load_window('{% url 'show-organization' form.instance.from_organization.pk '' %}', 'organization');" class="display_details">Détails</a>
         </td>
         <td>
-          {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})
+          {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})<br />
+          {{form.instance.from_organization.address_lbl|linebreaksbr}}
         </td>
         <td>
           <a href="#" onclick="load_window('{% url 'show-organization' form.instance.to_organization.pk '' %}', 'organization');" class="display_details">Détails</a>
         </td>
         <td>
-          {{form.instance.to_organization}} ({{form.instance.to_organization.pk}})
+          {{form.instance.to_organization}} ({{form.instance.to_organization.pk}})<br />
+          {{form.instance.to_organization.address_lbl|linebreaksbr}}
         </td>
         <td class='check'>{{form.b_is_duplicate_a}}</td>
         <td class='check'>{{form.a_is_duplicate_b}}</td>
diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html
index e5087fe48..f677a5cf3 100644
--- a/ishtar_common/templates/ishtar/merge_person.html
+++ b/ishtar_common/templates/ishtar/merge_person.html
@@ -7,13 +7,15 @@
           <a href="#" onclick="load_window('{% url 'show-person' form.instance.from_person.pk '' %}', 'person');" class="display_details">Détails</a>
         </td>
         <td>
-          {{form.instance.from_person}} ({{form.instance.from_person.pk}})
+          {{form.instance.from_person}} ({{form.instance.from_person.pk}})<br/>
+          {{form.instance.from_person.address_lbl|linebreaksbr}}
         </td>
         <td>
           <a href="#" onclick="load_window('{% url 'show-person' form.instance.to_person.pk '' %}', 'person');" class="display_details">Détails</a>
         </td>
         <td>
-          {{form.instance.to_person}} ({{form.instance.to_person.pk}})
+          {{form.instance.to_person}} ({{form.instance.to_person.pk}})<br/>
+          {{form.instance.to_person.address_lbl|linebreaksbr}}
         </td>
         <td class='check'>{{form.b_is_duplicate_a}}</td>
         <td class='check'>{{form.a_is_duplicate_b}}</td>
-- 
cgit v1.2.3