summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Barth <jeanbaptiste.barth@gmail.com>2010-10-29 22:28:24 +0000
committerJean-Baptiste Barth <jeanbaptiste.barth@gmail.com>2010-10-29 22:28:24 +0000
commit1cf67b3a1d87c762d1375683b95f4016e90be0a9 (patch)
tree21fbba39069d73502bb4eb65016ef575e0390532
parent5d6245b05950a4e6fd5a8318bdc6bc6050a2a7bd (diff)
downloadredmine-1cf67b3a1d87c762d1375683b95f4016e90be0a9.tar.gz
redmine-1cf67b3a1d87c762d1375683b95f4016e90be0a9.zip
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
-rw-r--r--app/views/settings/_authentication.rhtml2
1 files changed, 1 insertions, 1 deletions
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"],