Merge branch 'weixin_guange' into develop

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)

public/javascripts/application.js

@@ -1054,12 +1054,14 @@ function showNormalImage(id) {
 
             //无格式的图片不让点击显示大图，显示的话会有问题
             var tmpsrc = image.attr('src');
+            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}); //有图片才将链接变为弹出框
     }