Implement conflict resolution logic

2017-05-29 22:00:29 +03:00
parent 09e8c93e8d
commit 3a8d988033
3 changed files with 69 additions and 14 deletions
@@ -11,6 +11,13 @@
        <h2>{% trans "Member register" %}</h2>
    </div>

+    {% if is_member_conflict %}
+    <div class="alert alert-warning">
+        {% blocktrans %}There are duplicate member entries in the register.
+        Please visit <a href="/members/duplicates">duplicate resolver</a>.{% endblocktrans %}
+    </div>
+    {% endif %}
+
    {% if notification %}
    <div class="alert alert-success">
        {{ notification }}