|
|
|
@ -20,53 +20,12 @@ class WelcomeController < ApplicationController
|
|
|
|
|
before_filter :entry_select_course, :entry_select_contest, :entry_select_user, :only => [:index]
|
|
|
|
|
|
|
|
|
|
def index
|
|
|
|
|
# @news = News.latest User.current
|
|
|
|
|
# @projects = Project.latest User.current
|
|
|
|
|
#by young
|
|
|
|
|
(redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration]
|
|
|
|
|
if request.get?
|
|
|
|
|
session[:auth_source_registration] = nil
|
|
|
|
|
@user = User.new(:language => current_language.to_s)
|
|
|
|
|
else
|
|
|
|
|
user_params = params[:user] || {}
|
|
|
|
|
@user = User.new
|
|
|
|
|
@user.safe_attributes = user_params
|
|
|
|
|
@user.admin = false
|
|
|
|
|
@user.register
|
|
|
|
|
if session[:auth_source_registration]
|
|
|
|
|
@user.activate
|
|
|
|
|
@user.login = session[:auth_source_registration][:login]
|
|
|
|
|
@user.auth_source_id = session[:auth_source_registration][:auth_source_id]
|
|
|
|
|
if @user.save
|
|
|
|
|
session[:auth_source_registration] = nil
|
|
|
|
|
self.logged_user = @user
|
|
|
|
|
flash[:notice] = l(:notice_account_activated)
|
|
|
|
|
redirect_to my_account_path
|
|
|
|
|
end
|
|
|
|
|
else
|
|
|
|
|
@user.login = params[:user][:login]
|
|
|
|
|
unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
|
|
|
|
|
@user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
case Setting.self_registration
|
|
|
|
|
when '1'
|
|
|
|
|
register_by_email_activation(@user)
|
|
|
|
|
when '3'
|
|
|
|
|
register_automatically(@user)
|
|
|
|
|
else
|
|
|
|
|
register_manually_by_administrator(@user)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
#add by huang
|
|
|
|
|
# @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current))
|
|
|
|
|
|
|
|
|
|
# events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 20)
|
|
|
|
|
# @events_by_day = events.group_by(&:event_date)
|
|
|
|
|
projectActive = Project.project_entities.active
|
|
|
|
|
@projectCount = projectActive.count
|
|
|
|
|
@projectPublicCount = projectActive.all_public.count
|
|
|
|
|
@projectHidenCount = @projectCount - @projectPublicCount
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
@developerCount = User.developer.count
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def robots
|
|
|
|
|