Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/tags/_tag_name.html.erb

@@ -43,32 +43,32 @@
       <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
       <% case object_flag %>
 		<% when '1' %>
-		
+
-	      <% if User.current.eql?(obj) %> 
+	      <% if User.current.eql?(obj) %>
 	         <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 %>
-		  
+
 	    <% when '2' %>
-	    
+
 	     <% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_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 %>
-	     
+
 	     <% when '3' %>
-	     
+
 	       <% if (ProjectInfo.find_by_project_id(obj.project_id)).try(:user_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 %>
-	     
+
 	     <% when '4' %>
 	         <% 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 %>
 
 	    <% when '6' %>
@@ -82,10 +82,10 @@
 			<% end %>
 	     <% when '7' %>
 	        <% 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 %>
         <% when '9' %>
 
@@ -94,6 +94,13 @@
                                           :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>