From a62abdcb0c6daa71bc8bef293c20d911a63ccc60 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)

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

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

diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html
new file mode 100644
index 000000000..4118ee6d5
--- /dev/null
+++ b/ishtar_common/templates/ishtar/merge_organization.html
@@ -0,0 +1,23 @@
+{% 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-organization' form.instance.from_organization.pk '' %}', 'organization');" class="display_details">Détails</a>
+        </td>
+        <td>
+          {{form.instance.from_organization}} ({{form.instance.from_organization.pk}})
+        </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}})
+        </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