|
|
@ -30,11 +30,11 @@ class UsersController < ApplicationController
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info,
|
|
|
|
before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info,
|
|
|
|
:user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects]
|
|
|
|
:user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score]
|
|
|
|
#edit has been deleted by huang, 2013-9-23
|
|
|
|
#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,
|
|
|
|
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_bids, :info,
|
|
|
|
:destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info,
|
|
|
|
:watch_projects]
|
|
|
|
:watch_projects, :show_score]
|
|
|
|
accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
|
|
|
|
accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
|
|
|
|
|
|
|
|
|
|
|
|
#william
|
|
|
|
#william
|
|
|
@ -86,6 +86,10 @@ class UsersController < ApplicationController
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def show_score
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
##added by fq
|
|
|
|
##added by fq
|
|
|
|
def watch_bids
|
|
|
|
def watch_bids
|
|
|
|
cond = 'bids.reward_type <> 1'
|
|
|
|
cond = 'bids.reward_type <> 1'
|
|
|
|