From 23a457af9ef2602c58b5c3d942562ba72d08d4d6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 29 May 2015 11:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=9B=9E=E5=A4=8D=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    | 9 ++++++---
 app/views/student_work/add_score_reply.js.erb | 6 +++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index d3cb437ee..9f0cc1d4d 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -177,9 +177,12 @@ class StudentWorkController < ApplicationController
     @score = StudentWorksScore.find params[:score_id]
     @jour = @score.journals_for_messages.new(:user_id => User.current.id,:notes =>params[:message], :reply_id => 0)
     if @jour.save
-      respond_to do |format|
-        format.js
-      end
+      @status = 1
+    else
+      @status = 2
+    end
+    respond_to do |format|
+      format.js
     end
   end
 
diff --git a/app/views/student_work/add_score_reply.js.erb b/app/views/student_work/add_score_reply.js.erb
index 7b53b54d8..2c6f1c9bf 100644
--- a/app/views/student_work/add_score_reply.js.erb
+++ b/app/views/student_work/add_score_reply.js.erb
@@ -1,2 +1,6 @@
 $("#add_score_reply_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'add_score_reply', :locals => {:score => @score}) %>");
-$("#replay_histroy_<%= @score.id%>").prepend("<%= escape_javascript(render :partial => 'jour_replay', :locals => {:jour => @jour}) %>");
\ No newline at end of file
+<% if @status && @status == 1%>
+    $("#replay_histroy_<%= @score.id%>").prepend("<%= escape_javascript(render :partial => 'jour_replay', :locals => {:jour => @jour}) %>");
+<% else%>
+    alert("回复内容不能为空");
+<% end%>
\ No newline at end of file