diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-11-28 11:30:02 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-11-28 11:30:02 +0100 |
| commit | a62abdcb0c6daa71bc8bef293c20d911a63ccc60 (patch) | |
| tree | fc3cb300358ed90b4d08dac9a274bcc124dcec01 /ishtar_common/templates/ishtar/merge_organization.html | |
| parent | 9dd0ba91bdd9c76b42f4d6b4791633d7eac95b4a (diff) | |
| download | Ishtar-a62abdcb0c6daa71bc8bef293c20d911a63ccc60.tar.bz2 Ishtar-a62abdcb0c6daa71bc8bef293c20d911a63ccc60.zip | |
Merge action implementation (person and organization)
Diffstat (limited to 'ishtar_common/templates/ishtar/merge_organization.html')
| -rw-r--r-- | ishtar_common/templates/ishtar/merge_organization.html | 23 |
1 files changed, 23 insertions, 0 deletions
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 %} + |