From: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
Date: Fri, 29 Oct 2010 22:28:24 +0000 (+0000)
Subject: Fixed: disabling autologin not persisted. #6438
X-Git-Tag: 1.1.0~229
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1cf67b3a1d87c762d1375683b95f4016e90be0a9;p=redmine.git

Fixed: disabling autologin not persisted. #6438

Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4306 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml
index da29bb704..11220534f 100644
--- a/app/views/settings/_authentication.rhtml
+++ b/app/views/settings/_authentication.rhtml
@@ -3,7 +3,7 @@
 <div class="box tabular settings">
 <p><%= setting_check_box :login_required %></p>
 
-<p><%= setting_select :autologin, [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, :blank => :label_disabled %></p>
+<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
 
 <p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
 							                             [l(:label_registration_activation_by_email), "1"],