From c65d318fbb3edd06d2bbef89528561b7ebd446df Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 18 Jul 2015 16:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb |  1 +
 app/views/words/destroy.js.erb      | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 4ff01d36c..161791954 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -89,6 +89,7 @@ class WordsController < ApplicationController
     elsif @journal_destroyed.jour_type == "Principal"
       @user = User.find(@journal_destroyed.jour_id)
       @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
+      @is_user = true
     end
     respond_to do |format|
       format.js
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index 94f40064c..92e15ab93 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -1,26 +1,26 @@
 <% if @journal_destroyed.nil? %>
 	alert('<%=l(:notice_failed_delete)%>');
 <% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication'].include? @journal_destroyed.jour_type)%>
-  <% if @user && @jours_count%>
+  <% if @is_user%>
     $("#nh_jours_<%= @journal_destroyed.id %>",$("div[nhname='container']",$("#nh_messages"))).remove();
     var params = init_list_more_div_params($("#nh_messages"));
     change_status_4_list_more_div(params);
   <% else %>
-
-  <% if @bid && @jours_count %>
-    $('#jours_count').html("<%= @jours_count %>");
-  <% elsif @course && @jours_count%>
-    $('#course_jour_count').html("(<%= @jours_count %>)");
-  <% elsif @user && @jours_count%>
-    $('#jour_count').html("<%= @jours_count %>");
-  <% end %>
-  var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
-  destroyedItem.fadeOut(600,function(){
-    destroyedItem.remove();
-  });
+      <% if @bid && @jours_count %>
+        $('#jours_count').html("<%= @jours_count %>");
+      <% elsif @course && @jours_count%>
+        $('#course_jour_count').html("(<%= @jours_count %>)");
+      <% elsif @user && @jours_count%>
+        $('#jour_count').html("<%= @jours_count %>");
+      <% end %>
+      var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
+      destroyedItem.fadeOut(600,function(){
+        destroyedItem.remove();
+      });
 
   <% end %>
 <% else %>
 	$('#message').html('<%= escape_javascript(render(:partial => 'words/message', :locals => {:jour => @jour, :state => false, :user => @user, :feedback_pages => @feedback_pages})) %>');
 	$('#new_form_reference_user_id').val("");
 <% end %>
+