Download as
Browse Code »

Commit 88faac2bbbe3c493405080d58676bbf3f810c1f0

Authored by Daniela Feitosa
1 parent f67fad45
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

Added prettier error messages on password recovery 

(ActionItem2498)
Showing 2 changed files with 5 additions and 7 deletions   Show diff stats
app/models/change_password.rb
  Diff comments   View file @88faac2
@@ -7,7 +7,7 @@ class ChangePassword < Task @@ -7,7 +7,7 @@ class ChangePassword < Task
7 when :login: 7 when :login:
8 _('Username') 8 _('Username')
9 when :email 9 when :email
10 - _('e-Mail') 10 + _('e-mail')
11 when :password 11 when :password
12 _('Password') 12 _('Password')
13 when :password_confirmation 13 when :password_confirmation
@@ -20,9 +20,7 @@ class ChangePassword < Task @@ -20,9 +20,7 @@ class ChangePassword < Task
20 ################################################### 20 ###################################################
21 # validations for creating a ChangePassword task 21 # validations for creating a ChangePassword task
22 22
23 - validates_presence_of :login, :email, :environment_id, :on => :create  
24 -  
25 - validates_presence_of :requestor_id 23 + validates_presence_of :login, :email, :environment_id, :on => :create, :message => _('must be filled in')
26 24
27 validates_format_of :email, :on => :create, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |obj| !obj.email.blank? }) 25 validates_format_of :email, :on => :create, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |obj| !obj.email.blank? })
28 26
@@ -30,10 +28,10 @@ class ChangePassword < Task @@ -30,10 +28,10 @@ class ChangePassword < Task
30 unless data.login.blank? || data.email.blank? 28 unless data.login.blank? || data.email.blank?
31 user = User.find_by_login_and_environment_id(data.login, data.environment_id) 29 user = User.find_by_login_and_environment_id(data.login, data.environment_id)
32 if user.nil? 30 if user.nil?
33 - data.errors.add(:login, _('%{fn} is not a valid username.').fix_i18n) 31 + data.errors.add(:login, _('is invalid or user does not exists.'))
34 else 32 else
35 if user.email != data.email 33 if user.email != data.email
36 - data.errors.add(:email) 34 + data.errors.add(:email, _('does not match the username you filled in'))
37 end 35 end
38 end 36 end
39 end 37 end
app/views/account/forgot_password.rhtml
  Diff comments   View file @88faac2
1 <h1><%= _('Forgot your password?') %></h1> 1 <h1><%= _('Forgot your password?') %></h1>
2 2
3 -<%= error_messages_for :change_password %> 3 +<%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
4 4
5 <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %> 5 <% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
6 6