Merge branch 'cxt_course' into develop

Conflicts:
	public/javascripts/application.js

app/controllers/users_controller.rb

@@ -599,7 +599,7 @@ class UsersController < ApplicationController
     if(params[:type].blank? || params[:type] == "1") #我的题库
       courses = @user.courses.where("is_delete = 1")
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #公共题库
       visible_course = Course.where("is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"

public/javascripts/application.js

@@ -1500,7 +1500,7 @@ function pop_box_new(value, Width, Height){
     showModal('ajax-modal', Width + 'px');
     $('#ajax-modal').siblings().remove();
     $('#ajax-modal').parent().css({"top": h+"px","left": w+"px","padding":"0","border":"none","position":"fixed"});
-    $('#ajax-modal').css({"padding":"0"});
+    $('#ajax-modal').css({"padding":"0","overflow":"hidden"});
     $('#ajax-modal').parent().attr("id","popupWrap");
 
     //拖拽