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