From 46410c8e8dbd3b8974765bb5b934f314740d0a41 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 19 Mar 2015 16:02:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4T?=
 =?UTF-8?q?AG=E5=90=8Ejs=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=202=E3=80=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=BE=E7=A8=8BTAG=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/tags_controller.rb    |  4 ++--
 app/views/tags/_new_tag.html.erb      | 11 -----------
 app/views/tags/_new_tag_name.html.erb | 16 ++++++++++++++--
 app/views/tags/remove_tag.js.erb      |  6 ++++--
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 5bd5fb0e3..6738d2135 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -73,7 +73,7 @@ class TagsController < ApplicationController
     @issues_results,
     @bids_results,
     @forums_results,
-        @attachments_results,
+    @attachments_results,
     @contests_results,
     @courses_results,
     @open_source_projects_results= refresh_results(@obj_id,@obj_flag,@selected_tags)
@@ -109,7 +109,7 @@ class TagsController < ApplicationController
     @issues_results,
     @bids_results,
     @forums_results,
-        @attachments_results,
+    @attachments_results,
     @contests_results,
     @courses_results,
     @open_source_projects_results= refresh_results(@obj_id,@show_flag)
diff --git a/app/views/tags/_new_tag.html.erb b/app/views/tags/_new_tag.html.erb
index bc947e5c5..7db324cd7 100644
--- a/app/views/tags/_new_tag.html.erb
+++ b/app/views/tags/_new_tag.html.erb
@@ -18,17 +18,6 @@
   <% else %>
       <div id="tags_show">
         <%= render :partial => "tags/new_tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
-        <% if User.current.logged?%>
-            <a href="javascript:void(0)" class="yellowBtn f_l" onclick="$('#add_tag01').slideToggle();"><%= l(:label_add_tag)%></a>
-            <span id="add_tag01" style="display:none; vertical-align: middle;" class="ml10 f_l">
-              <%= form_for "tag_for_save",:remote=>true,:url=>tag_path,:update => "tags_show",:complete => '$("#put-tag-form").slideUp();' do |f| %>
-                <%= f.text_field :name ,:id => "tags_name",:size=>"20",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class =>"isTxt w90 f_l" %>
-                <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
-                <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
-                <input type="button" class="submit f_l" onclick="$('#tags_name').parent().submit();" />
-              <% end %>
-            </span>
-        <% end%>
       </div>
   <% end %>
 </div>
diff --git a/app/views/tags/_new_tag_name.html.erb b/app/views/tags/_new_tag_name.html.erb
index a1fb3fa46..6d8d58adb 100644
--- a/app/views/tags/_new_tag_name.html.erb
+++ b/app/views/tags/_new_tag_name.html.erb
@@ -9,9 +9,21 @@
             <span class="re_tag f_l " id="tag">
               <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id, :class => 'pt5' %>
               <span class="del">
-                <%= link_to('x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,:taggable_id => obj.id, :taggable_type => object_flag) if (CourseInfos.find_by_course_id(obj.id)).try(:user_id) == User.current.id %>
+                <%= link_to('x', remove_tag_path(:tag_name => tag,:taggable_id => obj.id, :taggable_type => object_flag), :remote => true, :confirm => l(:text_are_you_sure) ) if (CourseInfos.find_by_course_id(obj.id)).try(:user_id) == User.current.id %>
               </span>
             </span>
         <% end %>
     <% end %>
-<% end %>
\ No newline at end of file
+<% end %>
+
+<% if User.current.logged?%>
+    <a href="javascript:void(0)" class="yellowBtn f_l" onclick="$('#add_tag01').slideToggle();"><%= l(:label_add_tag)%></a>
+    <span id="add_tag01" style="display:none; vertical-align: middle;" class="ml10 f_l">
+              <%= form_for "tag_for_save",:remote=>true,:url=>tag_path,:update => "tags_show",:complete => '$("#put-tag-form").slideUp();' do |f| %>
+                <%= f.text_field :name ,:id => "tags_name",:size=>"20",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class =>"isTxt w90 f_l" %>
+          <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+          <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+          <input type="button" class="submit f_l" onclick="$('#tags_name').parent().submit();" />
+              <% end %>
+            </span>
+<% end%>
\ No newline at end of file
diff --git a/app/views/tags/remove_tag.js.erb b/app/views/tags/remove_tag.js.erb
index dbad80f96..b102776d5 100644
--- a/app/views/tags/remove_tag.js.erb
+++ b/app/views/tags/remove_tag.js.erb
@@ -6,8 +6,10 @@ $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_n
 	$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
 	$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false, :object_flag => @object_flag}) %>');
-<% else %>
+<% elsif @object_flag == '9'%>
+    $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/new_tag_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
+<% else%>
 $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
-
 <% end %>
\ No newline at end of file