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

app/controllers/comments_controller.rb

@@ -27,7 +27,7 @@ class CommentsController < ApplicationController
     raise Unauthorized unless @news.commentable?
 
     @comment = Comment.new
-    @comment.comments = params[:comment]
+    @comment.safe_attributes = params[:comment]
     @comment.author = User.current
     if @news.comments << @comment
       if params[:asset_id]

public/javascripts/course.js

@@ -403,4 +403,10 @@ $(function(){
 //将右侧的最小高度设置成左侧高度，美化界面
 $(document).ready(function () {
     $("#RSide").css("min-height",$("#LSide").height()-30);
-});
+});
+
+// 日历选择日期后关闭
+function regexDeadLine()
+{
+    ('#ui-datepicker-div').hide;
+}