From 467a6c4fbaf5def1d1b13d70446d76f04c02f1fc Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 10 Oct 2015 09:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AEtag=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_list.html.erb       | 3 ++-
 app/views/files/_project_file_list.html.erb | 3 ++-
 app/views/tags/_tag_list.html.erb           | 4 ++--
 app/views/tags/_tag_new.html.erb            | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index e31eea960..bad93f4ae 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -55,7 +55,8 @@
             </div>
             <div class="cl"></div>
             <div class="tag_h">
-              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+              <!-- container_type = 1 代表是课程里的资源 -->
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name,:container_type=>'1'} %>
               <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
             </div>
             <div class="cl"></div>
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index 9f9e86cff..6e2623c4b 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -44,7 +44,8 @@
         </div>
         <div class="cl"></div>
         <div class="tag_h">
-          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
+          <!-- container_type = 2 代表是项目里的资源 -->
+          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:container_type=>'2'} %>
           <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
         </div>
         <div class="cl"></div>
diff --git a/app/views/tags/_tag_list.html.erb b/app/views/tags/_tag_list.html.erb
index bc4a5b54e..3b46480c2 100644
--- a/app/views/tags/_tag_list.html.erb
+++ b/app/views/tags/_tag_list.html.erb
@@ -2,8 +2,8 @@
 
 <% if @tags.size > 0 %>
     <% @tags.each do |tag| %>
-	<span class="re_tag f_l" style="cursor: pointer" > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
-      <a title="双击可编辑" ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
+	<span class="re_tag f_l" style="cursor:<%= container_type == '1' ? 'pointer' :'default' %> " > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
+      <a title="<%= container_type == '1' ? '双击可编辑' : '' %> " ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
       <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
       <% case object_flag %>
 	    <% when '10' %>
diff --git a/app/views/tags/_tag_new.html.erb b/app/views/tags/_tag_new.html.erb
index bbedaff78..e416776e6 100644
--- a/app/views/tags/_tag_new.html.erb
+++ b/app/views/tags/_tag_new.html.erb
@@ -22,7 +22,7 @@
   <% elsif object_flag == '6' %>
       <div id="tags_show-<%=obj.class%>-<%=obj.id%>" style="display:inline; ">
         <% tag_name ||= ""%>
-        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name} %>
+        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name,:container_type=>container_type} %>
       </div>
       <div id="put-tag-form-<%=obj.class%>-<%=obj.id%>" style="display: none;height: 100px;">
         <%= render :partial => "courses/course_resources_html", :locals => {:obj => obj ,:object_flag => object_flag } %>