Download as
Browse Code »

Commit 5ab1856291d845b27f68c41f23ca76c78afcbce1

Authored by Jakub Troszok
1 parent 4426bc18
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixing requests tests.

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @5ab1856
... ... @@ -59,7 +59,7 @@ class User < ActiveRecord::Base
59 59 before_validation :generate_password, :on => :create
60 60  
61 61 def generate_password
62   - if self.force_random_password == true
  62 + if self.force_random_password
63 63 self.password = self.password_confirmation = Devise.friendly_token.first(8)
64 64 end
65 65 end
... ...
app/views/admin/users/_form.html.haml
  Diff comments   View file @5ab1856
... ... @@ -23,7 +23,7 @@
23 23 -if f.object.new_record?
24 24 .clearfix
25 25 = f.label :admin, :class => "checkbox" do
26   - = f.check_box :force_random_password
  26 + = f.check_box :force_random_password, {}, true, nil
27 27 %span Generate random password
28 28  
29 29 %div.password-fields
... ...