A user can remove the tags he added

2 files changed, 11 insertions, 2 deletions

diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index afbef7f..c4fe161 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -43,7 +43,7 @@
     </div>
     <div id="add-tag">
         <form id="add-tag-form" name="addtag" method="post"
-              action="{% url 'add_tag' mlist_fqdn=mlist.name threadid=threadid %}">
+              action="{% url 'tags' mlist_fqdn=mlist.name threadid=threadid %}">
             {% csrf_token %}
             {{ addtag_form.as_p }}
         </form>
diff --git a/hyperkitty/templates/threads/tags.html b/hyperkitty/templates/threads/tags.html
index 236e4c4..1ec4989 100644
--- a/hyperkitty/templates/threads/tags.html
+++ b/hyperkitty/templates/threads/tags.html
@@ -5,7 +5,16 @@
         <ul class="inline">
             {% for tag in tags %}
             <li>
-                <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=tag.tag %}" >{{ tag.tag }}</a>
+                <a href="{% url 'search_tag' mlist_fqdn=mlist.name tag=tag.tag %}"
+                   title="Search for tag {{ tag.tag|escape }}">{{ tag.tag }}</a>
+                {% if user == tag.user %}
+                <form method="post" class="rmtag" action="{% url 'tags' mlist_fqdn=mlist.name threadid=threadid %}">
+                    {% csrf_token %}
+                    <input type="hidden" name="action" value="rm" />
+                    <input type="hidden" name="tag" value="{{ tag.tag|escape }}" />
+                    <a href="#rmtag" title="Remove">&times;</a>
+                </form>
+                {% endif %}
                 {% if not forloop.last %} <span>|</span> {% endif %}
             </li>
             {% endfor %}