From 3bd0bf3c4962f3bc6857f7c667ee4a5988403a58 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 19 Mar 2015 16:20:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BEu?=
 =?UTF-8?q?rl=E4=BF=AE=E6=94=B9=202=E3=80=81=E5=88=A0=E9=99=A4=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=98=AFjs=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_new_tag_name.html.erb |  2 +-
 app/views/tags/tag_save.js.erb        | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/views/tags/_new_tag_name.html.erb b/app/views/tags/_new_tag_name.html.erb
index 6d8d58adb..3e8c2c021 100644
--- a/app/views/tags/_new_tag_name.html.erb
+++ b/app/views/tags/_new_tag_name.html.erb
@@ -19,7 +19,7 @@
 <% 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| %>
+              <%= form_for "tag_for_save",:remote=>true,:url=>save_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"%>
diff --git a/app/views/tags/tag_save.js.erb b/app/views/tags/tag_save.js.erb
index 20ffb54cf..b4866bb89 100644
--- a/app/views/tags/tag_save.js.erb
+++ b/app/views/tags/tag_save.js.erb
@@ -1,9 +1,23 @@
 //本js使用的新的tag显示方法
-<% if @obj_flag == '6'%>
+<% if @obj_flag == '3'%>
+$('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
+                                        :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+//$('#put-tag-form-issue').hide();
+$('#name-issue').val("");
+<% elsif @obj_flag == '6'%>
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
-$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
 //$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide();
-$("#tags_name_<%= @obj.id%>").val("");
+$("#put-tag-form-<%=@obj.class%>-<%=@obj.id%> #name").val("");
+<% elsif  @obj_flag == '9'%>
+    $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/new_tag_name',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+    $('#tags_name').val("");
+<% else%>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
+                        :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+$('#tags_name').val("");
 //$('#put-tag-form').hide();
-<% end %>
\ No newline at end of file
+<% end %>
+