Description:
added default contest
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r308:c400f7405eee - - 3 files changed: 23 inserted, 1 deleted
| @@ -45,25 +45,25 | |||||
|
|
45 | def new |
|
45 | def new |
|
|
46 | @user = User.new |
|
46 | @user = User.new |
|
|
47 | end |
|
47 | end |
|
|
48 |
|
48 | ||
|
|
49 | def create |
|
49 | def create |
|
|
50 | @user = User.new(params[:user]) |
|
50 | @user = User.new(params[:user]) |
|
|
51 | @user.activated = true |
|
51 | @user.activated = true |
|
|
52 | if @user.save |
|
52 | if @user.save |
|
|
53 | flash[:notice] = 'User was successfully created.' |
|
53 | flash[:notice] = 'User was successfully created.' |
|
|
54 | redirect_to :action => 'list' |
|
54 | redirect_to :action => 'list' |
|
|
55 | else |
|
55 | else |
|
|
56 | render :action => 'new' |
|
56 | render :action => 'new' |
|
|
57 | - end |
|
57 | + end |
|
|
58 | end |
|
58 | end |
|
|
59 |
|
59 | ||
|
|
60 | def create_from_list |
|
60 | def create_from_list |
|
|
61 | lines = params[:user_list] |
|
61 | lines = params[:user_list] |
|
|
62 |
|
62 | ||
|
|
63 | note = [] |
|
63 | note = [] |
|
|
64 |
|
64 | ||
|
|
65 | lines.split("\n").each do |line| |
|
65 | lines.split("\n").each do |line| |
|
|
66 | items = line.chomp.split(',') |
|
66 | items = line.chomp.split(',') |
|
|
67 | if items.length>=2 |
|
67 | if items.length>=2 |
|
|
68 | login = items[0] |
|
68 | login = items[0] |
|
|
69 | full_name = items[1] |
|
69 | full_name = items[1] |
| @@ -44,24 +44,25 | |||||
|
|
44 | :if => :email_validation? |
|
44 | :if => :email_validation? |
|
|
45 | validate :enough_time_interval_between_same_email_registrations, |
|
45 | validate :enough_time_interval_between_same_email_registrations, |
|
|
46 | :if => :email_validation? |
|
46 | :if => :email_validation? |
|
|
47 |
|
47 | ||
|
|
48 | # these are for ytopc |
|
48 | # these are for ytopc |
|
|
49 | # disable for now |
|
49 | # disable for now |
|
|
50 | #validates_presence_of :province |
|
50 | #validates_presence_of :province |
|
|
51 |
|
51 | ||
|
|
52 | attr_accessor :password |
|
52 | attr_accessor :password |
|
|
53 |
|
53 | ||
|
|
54 | before_save :encrypt_new_password |
|
54 | before_save :encrypt_new_password |
|
|
55 | before_save :assign_default_site |
|
55 | before_save :assign_default_site |
|
|
|
56 | + before_save :assign_default_contest | ||
|
|
56 |
|
57 | ||
|
|
57 | # this is for will_paginate |
|
58 | # this is for will_paginate |
|
|
58 | cattr_reader :per_page |
|
59 | cattr_reader :per_page |
|
|
59 | @@per_page = 50 |
|
60 | @@per_page = 50 |
|
|
60 |
|
61 | ||
|
|
61 | def self.authenticate(login, password) |
|
62 | def self.authenticate(login, password) |
|
|
62 | user = find_by_login(login) |
|
63 | user = find_by_login(login) |
|
|
63 | return user if user && user.authenticated?(password) |
|
64 | return user if user && user.authenticated?(password) |
|
|
64 | end |
|
65 | end |
|
|
65 |
|
66 | ||
|
|
66 | def authenticated?(password) |
|
67 | def authenticated?(password) |
|
|
67 | if self.activated |
|
68 | if self.activated |
| @@ -264,24 +265,37 | |||||
|
|
264 | # have to catch error when migrating (because self.site is not available). |
|
265 | # have to catch error when migrating (because self.site is not available). |
|
|
265 | begin |
|
266 | begin |
|
|
266 | if self.site==nil |
|
267 | if self.site==nil |
|
|
267 | self.site = Site.find_by_name('default') |
|
268 | self.site = Site.find_by_name('default') |
|
|
268 | if self.site==nil |
|
269 | if self.site==nil |
|
|
269 | self.site = Site.find(1) # when 'default has be renamed' |
|
270 | self.site = Site.find(1) # when 'default has be renamed' |
|
|
270 | end |
|
271 | end |
|
|
271 | end |
|
272 | end |
|
|
272 | rescue |
|
273 | rescue |
|
|
273 | end |
|
274 | end |
|
|
274 | end |
|
275 | end |
|
|
275 |
|
276 | ||
|
|
|
277 | + def assign_default_contest | ||
|
|
|
278 | + # have to catch error when migrating (because self.site is not available). | ||
|
|
|
279 | + begin | ||
|
|
|
280 | + if self.contests.length == 0 | ||
|
|
|
281 | + default_contest = Contest.find_by_name(Configuration['contest.default_contest_name']) | ||
|
|
|
282 | + if default_contest | ||
|
|
|
283 | + self.contests = [default_contest] | ||
|
|
|
284 | + end | ||
|
|
|
285 | + end | ||
|
|
|
286 | + rescue | ||
|
|
|
287 | + end | ||
|
|
|
288 | + end | ||
|
|
|
289 | + | ||
|
|
276 | def password_required? |
|
290 | def password_required? |
|
|
277 | self.hashed_password.blank? || !self.password.blank? |
|
291 | self.hashed_password.blank? || !self.password.blank? |
|
|
278 | end |
|
292 | end |
|
|
279 |
|
293 | ||
|
|
280 | def self.encrypt(string,salt) |
|
294 | def self.encrypt(string,salt) |
|
|
281 | Digest::SHA1.hexdigest(salt + string) |
|
295 | Digest::SHA1.hexdigest(salt + string) |
|
|
282 | end |
|
296 | end |
|
|
283 |
|
297 | ||
|
|
284 | def uniqueness_of_email_from_activated_users |
|
298 | def uniqueness_of_email_from_activated_users |
|
|
285 | user = User.activated_users.find_by_email(self.email) |
|
299 | user = User.activated_users.find_by_email(self.email) |
|
|
286 | if user and (user.login != self.login) |
|
300 | if user and (user.login != self.login) |
|
|
287 | self.errors.add_to_base("Email has already been taken") |
|
301 | self.errors.add_to_base("Email has already been taken") |
| @@ -98,25 +98,33 | |||||
|
|
98 | }, |
|
98 | }, |
|
|
99 |
|
99 | ||
|
|
100 | { |
|
100 | { |
|
|
101 | :key => 'system.multicontests', |
|
101 | :key => 'system.multicontests', |
|
|
102 | :value_type => 'boolean', |
|
102 | :value_type => 'boolean', |
|
|
103 | :default_value => 'false' |
|
103 | :default_value => 'false' |
|
|
104 | }, |
|
104 | }, |
|
|
105 |
|
105 | ||
|
|
106 | { |
|
106 | { |
|
|
107 | :key => 'contest.confirm_indv_contest_start', |
|
107 | :key => 'contest.confirm_indv_contest_start', |
|
|
108 | :value_type => 'boolean', |
|
108 | :value_type => 'boolean', |
|
|
109 | :default_value => 'false' |
|
109 | :default_value => 'false' |
|
|
|
110 | + }, | ||
|
|
|
111 | + | ||
|
|
|
112 | + { | ||
|
|
|
113 | + :key => 'contest.default_contest_name', | ||
|
|
|
114 | + :value_type => 'string', | ||
|
|
|
115 | + :default_value => 'none', | ||
|
|
|
116 | + :description => "New user will be assigned to this contest automatically, if it exists. Set to 'none' if there is no default contest." | ||
|
|
110 | } |
|
117 | } |
|
|
|
118 | + | ||
|
|
111 | ] |
|
119 | ] |
|
|
112 |
|
120 | ||
|
|
113 |
|
121 | ||
|
|
114 | def create_configuration_key(key, |
|
122 | def create_configuration_key(key, |
|
|
115 | value_type, |
|
123 | value_type, |
|
|
116 | default_value, |
|
124 | default_value, |
|
|
117 | description='') |
|
125 | description='') |
|
|
118 | conf = (Configuration.find_by_key(key) || |
|
126 | conf = (Configuration.find_by_key(key) || |
|
|
119 | Configuration.new(:key => key, |
|
127 | Configuration.new(:key => key, |
|
|
120 | :value_type => value_type, |
|
128 | :value_type => value_type, |
|
|
121 | :value => default_value)) |
|
129 | :value => default_value)) |
|
|
122 | conf.description = description |
|
130 | conf.description = description |
You need to be logged in to leave comments.
Login now