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

app/controllers/words_controller.rb

@@ -85,6 +85,9 @@ class WordsController < ApplicationController
     elsif @journal_destroyed.jour_type == "Course"
       @course = Course.find @journal_destroyed.jour_id
       @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
+    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
     end
     respond_to do |format|
       format.js

app/views/school/index.html.erb

@@ -53,7 +53,7 @@
         }
         $.ajax({
             type :"POST",
-            url :prefix + '/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
+            url :prefix + '/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+encodeURIComponent(province),
             data :'text',
             success: function(data){
                 $("#schoollist").html(data);

app/views/words/destroy.js.erb

@@ -5,6 +5,8 @@
     $('#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(){