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 | 1cc8d6156a79d8eff8d9f6ee82797df6e464408d (patch) | |
| tree | fc3cb300358ed90b4d08dac9a274bcc124dcec01 /ishtar_common/templates/ishtar/merge_person.html | |
| parent | 1094b07f381b658f8325c2723afa2e26b8909ebb (diff) | |
| download | Ishtar-1cc8d6156a79d8eff8d9f6ee82797df6e464408d.tar.bz2 Ishtar-1cc8d6156a79d8eff8d9f6ee82797df6e464408d.zip | |
Merge action implementation (person and organization)
Diffstat (limited to 'ishtar_common/templates/ishtar/merge_person.html')
| -rw-r--r-- | ishtar_common/templates/ishtar/merge_person.html | 22 |
1 files changed, 22 insertions, 0 deletions
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 %} |
