From 025d07e6a4ecb3039c863bc226d6218ea3817cab Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 16 May 2016 17:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E4=BF=A1=E6=81=AF=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=B0=8F=E5=BF=83=E6=B3=A8=E9=87=8A=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 4 ++--
 public/javascripts/application.js          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 3497e9fdd..19fe8de9e 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -132,9 +132,9 @@ class StudentWorkController < ApplicationController
             #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
             resultObj[:status] = -1
             resultObj[:results] = result["results"].first  #本次测试结果
-            # if result["status"].to_i == -2 #编译错误
+            if result["status"].to_i == -2 #编译错误
               result["error_msg"] = result["error_msg"][0..2047]
-            # end
+            end
             resultObj[:error_msg] = result["error_msg"]   #编译错误时的信息
 
             #该状态用于存入CodeTests
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9820f66ff..d9f532a48 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1262,7 +1262,7 @@ function description_showwords_ellipsis(id,num){
 
 }
 
-//by yk 弹框  tWidth = 580  tTop=30 tLeft=50
+//by yk 弹框 value：html代码或跳转其他页面代码 tWidth = 580  tTop=30 tLeft=50
 function pop_up_box(value,tWidth,tTop,tLeft){
 
     if(!tWidth){