deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #971 from gingko/master

Browse source 
Automatic password creation..
This commit is contained in:
Dmitriy Zaporozhets 2012-06-26 23:41:49 -07:00
commit 4c1f435ab7
4 changed files with 56 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/models/user.rb
View file

@ -5,7 +5,10 @@ class User < ActiveRecord::Base
:recoverable, :rememberable, :trackable, :validatable, :omniauthable
attr_accessible :email, :password, :password_confirmation, :remember_me, :bio,
:name, :projects_limit, :skype, :linkedin, :twitter, :dark_scheme, :theme_id
:name, :projects_limit, :skype, :linkedin, :twitter, :dark_scheme,
:theme_id, :force_random_password
attr_accessor :force_random_password
has_many :users_projects, :dependent => :destroy
has_many :projects, :through => :users_projects
@ -53,6 +56,14 @@ class User < ActiveRecord::Base
scope :blocked, where(:blocked => true)
scope :active, where(:blocked => false)
before_validation :generate_password, :on => :create
def generate_password
if self.force_random_password
self.password = self.password_confirmation = Devise.friendly_token.first(8)
end
end
def self.filter filter_name
case filter_name
when "admins"; self.admins