|
|
|
|
@ -39,20 +39,14 @@ class UsersController < ApplicationController
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
|
|
|
|
|
before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_contests, :info,
|
|
|
|
|
:user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,
|
|
|
|
|
:activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
|
|
|
|
|
:activity_new_score_index, :influence_new_score_index, :score_new_index,:update_score,:user_activities,:user_projects_index,
|
|
|
|
|
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,
|
|
|
|
|
:user_resource,:user_resource_create,:user_resource_delete,:rename_resource,:search_user_course,:add_exist_file_to_course,
|
|
|
|
|
:search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages,:edit_brief_introduction,:user_new_homework]
|
|
|
|
|
#edit has been deleted by huang, 2013-9-23
|
|
|
|
|
before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
|
|
|
|
|
:user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,
|
|
|
|
|
:watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
|
|
|
|
|
:activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
|
|
|
|
|
:activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
|
|
|
|
|
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction]
|
|
|
|
|
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
|
|
|
|
|
:user_import_homeworks,:user_search_homeworks]
|
|
|
|
|
before_filter :auth_user_extension, only: :show
|
|
|
|
|
#before_filter :rest_user_score, only: :show
|
|
|
|
|
#before_filter :select_entry, only: :user_projects
|
|
|
|
|
@ -176,6 +170,7 @@ class UsersController < ApplicationController
|
|
|
|
|
render_404
|
|
|
|
|
return
|
|
|
|
|
end
|
|
|
|
|
@message_alls = paginateHelper @message_alls,25
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.html{render :layout=>'new_base_user'}
|
|
|
|
|
end
|
|
|
|
|
@ -310,7 +305,46 @@ class UsersController < ApplicationController
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js
|
|
|
|
|
format.html {render :layout => 'new_base_user'}
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
#导入作业
|
|
|
|
|
def user_import_homeworks
|
|
|
|
|
@user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
#用户主页过滤作业
|
|
|
|
|
def user_search_homeworks
|
|
|
|
|
@user_homeworks = HomeworkCommon.where("user_id = '#{@user.id}' and lower(name) like '%#{params[:name].to_s.downcase}%'").order("created_at desc")
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
#导入作业，确定按钮
|
|
|
|
|
def user_select_homework
|
|
|
|
|
homework = HomeworkCommon.find_by_id params[:checkMenu]
|
|
|
|
|
@homework = HomeworkCommon.new
|
|
|
|
|
if homework
|
|
|
|
|
@homework.name = homework.name
|
|
|
|
|
@homework.description = homework.description
|
|
|
|
|
@homework.end_time = homework.end_time
|
|
|
|
|
@homework.course_id = homework.course_id
|
|
|
|
|
homework.attachments.each do |attachment|
|
|
|
|
|
att = attachment.copy
|
|
|
|
|
att.container_id = nil
|
|
|
|
|
att.container_type = nil
|
|
|
|
|
att.copy_from = attachment.id
|
|
|
|
|
att.save
|
|
|
|
|
@homework.attachments << att
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def user_new_homework
|
|
|
|
|
|
