From 1cc8d6156a79d8eff8d9f6ee82797df6e464408d Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Fri, 28 Nov 2014 11:30:02 +0100
Subject: Merge action implementation (person and organization)

---
 ishtar_common/templates/ishtar/merge_person.html | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 ishtar_common/templates/ishtar/merge_person.html

(limited to 'ishtar_common/templates/ishtar/merge_person.html')

diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html
new file mode 100644
index 000000000..6b67182b3
--- /dev/null
+++ b/ishtar_common/templates/ishtar/merge_person.html
@@ -0,0 +1,22 @@
+{% extends "ishtar/merge.html" %}
+{% load url from future %}
+{% 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>
+        <td>
+          <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}})
+        </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)
+        </td>
+        <td class='check'>{{form.b_is_duplicate_a}}</td>
+        <td class='check'>{{form.a_is_duplicate_b}}</td>
+        <td class='check'>{{form.not_duplicate}}</td>
+      </tr>
+{% endblock %}
-- 
cgit v1.2.3