|
|
|
@ -40,14 +40,14 @@ class UsersController < ApplicationController
|
|
|
|
|
: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_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist]
|
|
|
|
|
#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_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show]
|
|
|
|
|
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist]
|
|
|
|
|
before_filter :auth_user_extension, only: :show
|
|
|
|
|
#before_filter :rest_user_score, only: :show
|
|
|
|
|
#before_filter :select_entry, only: :user_projects
|
|
|
|
@ -58,6 +58,9 @@ class UsersController < ApplicationController
|
|
|
|
|
#before_filter :refresh_changests, :only =>[:user_activities,:user_courses,:user_projects,:user_newfeedback]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#visitor
|
|
|
|
|
before_filter :recorded_visitor, :only => [:show,:user_fanslist,:user_watchlist,:user_visitorlist]
|
|
|
|
|
|
|
|
|
|
helper :sort
|
|
|
|
|
include SortHelper
|
|
|
|
|
helper :custom_fields
|
|
|
|
@ -1025,6 +1028,17 @@ class UsersController < ApplicationController
|
|
|
|
|
@action = 'fans'
|
|
|
|
|
render :layout=>'base_users_new'
|
|
|
|
|
end
|
|
|
|
|
def user_visitorlist
|
|
|
|
|
limit = 10;
|
|
|
|
|
#query = @user.watcher_users;
|
|
|
|
|
query = User.joins("join visitors v on #{User.table_name}.id=v.user_id")
|
|
|
|
|
query = query.where("v.master_id=?",@user.id)
|
|
|
|
|
@obj_count = query.count();
|
|
|
|
|
@obj_pages = Paginator.new @obj_count,limit,params['page']
|
|
|
|
|
@list = query.order("v.updated_on desc").limit(limit).offset(@obj_pages.offset).all();
|
|
|
|
|
@action = 'visitor'
|
|
|
|
|
render :template=>'users/user_fanslist',:layout=>'base_users_new'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
#william
|
|
|
|
|
def update_extensions(user_extensions)
|
|
|
|
@ -1128,4 +1142,20 @@ class UsersController < ApplicationController
|
|
|
|
|
render_404
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def recorded_visitor
|
|
|
|
|
if(User.current.logged? && User.current != @user)
|
|
|
|
|
#impl = Visitor.where('user_id=? and master_id=?',User.current.id,@user.id).find;
|
|
|
|
|
# impl = Visitor.find_by_sql('user_id=? and master_id=?',[User.current.id,@user.id]);
|
|
|
|
|
impl = Visitor.find_by_user_id_and_master_id(User.current.id,@user.id);
|
|
|
|
|
if(impl.nil?)
|
|
|
|
|
impl = Visitor.new
|
|
|
|
|
impl.user_id = User.current.id
|
|
|
|
|
impl.master_id = @user.id
|
|
|
|
|
else
|
|
|
|
|
impl.updated_on = Time.now
|
|
|
|
|
end
|
|
|
|
|
impl.save
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|