Fixed tag remove & tag link. See #8289

Domgaudioso · Mar 15, 2012 · a50767e · a50767e
1 parent a60865a
commit a50767e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...s/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html b/...s/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
@@ -210,12 +210,15 @@
                 // bind removeItem to various [-] buttons
                 $(".removeComment").click(function(event) {
                     removeItem(event, "ann_comment_wrapper");
+                    return false;
                 });
                 $(".removeTag").click(function(event) {
                     removeItem(event, "tag_annotation_wrapper");
+                    return false;
                 });
                 $(".removeFile").click(function(event) {
                     removeItem(event, "file_ann_wrapper");
+                    return false;
                 });
 
                 var deleteItem = function(event, domClass) {

diff --git a/components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/tag.html b/components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/tag.html
@@ -30,11 +30,12 @@
 {% endcomment %}
 
 <span class="tag_annotation_wrapper">
-    	<a class='tooltip tag' href="{% url load_template "usertags" %}{% if not tag.isOwned %}?experimenter={{ tag.getOwner.id }}{% endif %}" target="_top"> {{ tag.textValue }} <span class='removeTag' id="{{ tag.id }}-tag" title="Unlink"> x </span></a> 
-    {% if tag.link.isOwned %}
-
-    {% endif %}
-
+        <a class='tooltip tag' href="{% url load_template "usertags" %}?path=tag={{ tag.id }}{% if not tag.isOwned %}&experimenter={{ tag.getOwner.id }}{% endif %}" target="_top"> {{ tag.textValue }}
+            {% if tag.link.isOwned %}
+                <span class='removeTag' id="{{ tag.id }}-tag" title="Unlink"> x </span>
+            {% endif %}
+        </a>
+
     <span class="tooltip_html" style='display:none'>
         <b>Owner:</b> {{ tag.getOwner.getFullName }}<br />
         <b>Linked by:</b> {{ tag.link.getDetails.getOwner.getFullName }}<br />