From 5ab1856291d845b27f68c41f23ca76c78afcbce1 Mon Sep 17 00:00:00 2001
From: Jakub Troszok <troszok@gmail.com>
Date: Wed, 27 Jun 2012 00:55:54 +0200
Subject: [PATCH] Fixing requests tests.
---
app/models/user.rb | 2 +-
app/views/admin/users/_form.html.haml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index 69750922fa41d..02bfabea7f9be 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -59,7 +59,7 @@ class User < ActiveRecord::Base
before_validation :generate_password, :on => :create
def generate_password
- if self.force_random_password == true
+ if self.force_random_password
self.password = self.password_confirmation = Devise.friendly_token.first(8)
end
end
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 1e8a44e406ae2..bd2e136247aa9 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -23,7 +23,7 @@
-if f.object.new_record?
.clearfix
= f.label :admin, :class => "checkbox" do
- = f.check_box :force_random_password
+ = f.check_box :force_random_password, {}, true, nil
%span Generate random password
%div.password-fields
--
GitLab