Download as
Browse Code »

Commit 5034abbbf3048fe63b8d343b58dd10998b3f2865

Authored by Rodrigo Souto
1 parent c6bf7b15
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Adding email to login label

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @5034abb
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base @@ -15,7 +15,7 @@ class User < ActiveRecord::Base
15 # FIXME ugly workaround 15 # FIXME ugly workaround
16 def self.human_attribute_name(attrib) 16 def self.human_attribute_name(attrib)
17 case attrib.to_sym 17 case attrib.to_sym
18 - when :login: return _('Username') 18 + when :login: return [_('Username'), _('Email')].join(' / ')
19 when :email: return _('e-Mail') 19 when :email: return _('e-Mail')
20 else _(self.superclass.human_attribute_name(attrib)) 20 else _(self.superclass.human_attribute_name(attrib))
21 end 21 end
@@ -116,7 +116,7 @@ class User < ActiveRecord::Base @@ -116,7 +116,7 @@ class User < ActiveRecord::Base
116 116
117 validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n 117 validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
118 118
119 - # Authenticates a user by their login name and unencrypted password. Returns the user or nil. 119 + # Authenticates a user by their login name or email and unencrypted password. Returns the user or nil.
120 def self.authenticate(login, password, environment = nil) 120 def self.authenticate(login, password, environment = nil)
121 environment ||= Environment.default 121 environment ||= Environment.default
122 u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL', 122 u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',