Download as
Browse Code »

Commit cc44859be857f23cc4d31d33ca95bd43b3d96a3e

Authored by Michel Felipe
1 parent f0214e00
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Apply suggestions of @brauliobo. Change the scope of UserNotActive exception to User model namespace

Showing 2 changed files with 14 additions and 16 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @cc44859
... ... @@ -48,7 +48,7 @@ class AccountController < ApplicationController
48 48  
49 49 begin
50 50 self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
51   - rescue NoosferoExceptions::UserNotActivated => e
  51 + rescue User::UserNotActivated => e
52 52 session[:notice] = e.message
53 53 return
54 54 end
... ...
app/models/user.rb
  Diff comments   View file @cc44859
... ... @@ -242,11 +242,21 @@ class User < ActiveRecord::Base
242 242 password.crypt(salt)
243 243 end
244 244  
  245 + class UserNotActivated < StandardError
  246 + attr_reader :user
  247 +
  248 + def initialize(message, user = nil)
  249 + @user = user
  250 +
  251 + super(message)
  252 + end
  253 + end
  254 +
245 255 def authenticated?(password)
246 256  
247 257 unless self.activated?
248 258 message = _('The user "%{login}" is not activated! Please check your email to activate your user') % {login: self.login}
249   - raise NoosferoExceptions::UserNotActivated.new(message, self)
  259 + raise UserNotActivated.new(message, self)
250 260 end
251 261  
252 262 result = (crypted_password == encrypt(password))
... ... @@ -293,9 +303,9 @@ class User &lt; ActiveRecord::Base
293 303 self.errors.add(:current_password, _('does not match.'))
294 304 raise IncorrectPassword
295 305 end
296   - rescue NoosferoExceptions::UserNotActivated => e
  306 + rescue UserNotActivated => e
297 307 self.errors.add(:current_password, e.message)
298   - raise IncorrectPassword
  308 + raise UserNotActivated
299 309 end
300 310 self.force_change_password!(new, confirmation)
301 311 end
... ... @@ -411,15 +421,3 @@ class User &lt; ActiveRecord::Base
411 421 Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => (NOOSFERO_CONF['hours_until_user_activation_check'] || 72).hours.from_now})
412 422 end
413 423 end
414   -
415   -module NoosferoExceptions
416   - class UserNotActivated < ActiveRecord::ActiveRecordError
417   - attr_reader :user
418   -
419   - def initialize(message, user = nil)
420   - @user = user
421   -
422   - super(message)
423   - end
424   - end
425   -end
... ...