From 9ac53e5a0bf3ccf66199e0e8cb3c34bda467caf5 Mon Sep 17 00:00:00 2001
From: zhanghaitao <562681745@qq.com>
Date: Thu, 14 Aug 2014 15:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E5=87=BA=E5=BC=82=E5=B8=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_tag_name.html.erb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 531ed6966..5713e9a2e 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -72,11 +72,12 @@
 	         <% end %>
 
 	    <% when '6' %>
-		    <% if (User.current.logged? &&
+		    <%# if (User.current.logged? &&
                     User.current.admin?
             # && (@project && User.current.member_of?(@project))
             )
             %>
+          <% if obj.author_id == User.current.id || User.current.admin?%>
 		        <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
                                                :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 			<% end %>
@@ -94,14 +95,8 @@
                                           :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 	     <% end %>
 	    <% end %>
-      <!--添加的删除标签（0814添加）  -->
-      <!--<%# if obj.author_id == User.current.id %>
 
-	          <span class='del'> <%#= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
-                                             :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 
-	         <%# end %>
-	         -->
     </span>
 
             </div>