From 2ac827c66fd999b1efd42f6a1362889c37681d97 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 26 Sep 2016 09:44:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=87=BA=E9=94=99=E6=97=B6=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index f6a97e66c..cd80575a2 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -106,13 +106,13 @@ class StudentWorkController < ApplicationController
         rescue Timeout::Error
           tEndtime = Time.now
           tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-          logger.debug "program_test_ex user wait time = #{tUsedtime} 毫秒"
+          logger.info "program_test_ex user wait time = #{tUsedtime} 毫秒"
           #status 0:答案正确 -5program_test_ex 函数出错 -4judge代码出错 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
           resultObj[:status] = -3
           CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>-3,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
         rescue => e
           #-4 judge代码 出错
-          logger.debug "program_test_error #{e}"
+          logger.info "program_test_error #{e}"
           resultObj[:status] = -4
           tmpstatus = -4
           CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>0,:wait_time=>0,:student_work_id=>student_work.id)
@@ -217,7 +217,7 @@ class StudentWorkController < ApplicationController
           end
         rescue
           #-5 program_test_ex 函数出错
-          logger.debug "program_test_error 2"
+          logger.info "program_test_error 2"
           resultObj[:status] = -5
           tmpstatus = -5
           CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>0,:wait_time=>0,:student_work_id=>student_work.id)

From 1620a13565411cb7c3e82b055f1a2b96f16edcb3 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 27 Sep 2016 09:13:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=94=BE=E5=A4=A7js=E7=9A=84=E4=B8=80=E4=B8=AABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/application.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index aeb9e645a..5165a67bc 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1054,10 +1054,12 @@ function showNormalImage(id) {
 
             //无格式的图片不让点击显示大图，显示的话会有问题
             var tmpsrc = image.attr('src');
-            if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) {
-                var element = $("<a></a>").attr("href", image.attr('src'));
-                image.wrap(element);
-                $(image).parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false});
+            if(tmpsrc){
+                if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) {
+                    var element = $("<a></a>").attr("href", image.attr('src'));
+                    image.wrap(element);
+                    $(image).parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false});
+                }
             }
         }
         //$('#'+id+' a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); //有图片才将链接变为弹出框