diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 90fdbe837..d25dd6fd2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -881,8 +881,8 @@ class UsersController < ApplicationController @page = params[:page] ? params[:page].to_i + 1 : 0 user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")" user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")" - course_types = "('Message','News','HomeworkCommon','Poll')" - project_types = "('Message','Issue')" + course_types = "('Message','News','HomeworkCommon','Poll','Course')" + project_types = "('Message','Issue','ProjectCreateInfo')" principal_types = "JournalsForMessage" if params[:type].present? case params[:type] diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index b439adaac..4a2fe446d 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -557,6 +557,17 @@ // }); //查询学校 $("input[name='province']").on('input', function (e) { + throttle(shcool_search_fn,window,e); + }); + + function throttle(method,context,e){ + clearTimeout(method.tId); + method.tId=setTimeout(function(){ + method.call(context,e); + },500); + } + + function shcool_search_fn(e){ $("input[name='occupation']").val(''); //一旦有输入就清空id。 if($(e.target).val().trim() == lastSearchCondition && $(e.target).val().trim() != ''){ return; @@ -592,7 +603,7 @@ } } }); - }); + } $(document.body).click(function(e){ if($(e.target).attr("id") != 'search_school_result_list' && $(e.target).attr("id") != 'province') { diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index d07cb4a2d..8e3b5a5dc 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -1,18 +1,27 @@ +<% project = Project.find(activity.act_id) %> +<% user = User.find(project.user_id)%>