From 2b7c31feb50469ea8512ebf52e2b2c8f6239accb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 4 Feb 2007 15:54:56 +0000 Subject: [PATCH] setting password_lost renamed to lost_password git-svn-id: http://redmine.rubyforge.org/svn/trunk@235 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/account/login.rhtml | 2 +- app/views/settings/edit.rhtml | 2 +- config/settings.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml index 9f1e3dc63..5a94cb1ed 100644 --- a/app/views/account/login.rhtml +++ b/app/views/account/login.rhtml @@ -15,7 +15,7 @@
<% links = [] links << link_to(l(:label_register), :action => 'register') if Setting.self_registration? - links << link_to(l(:label_password_lost), :action => 'password_lost') if Setting.password_lost? + links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password? %> <%= links.join(" | ") %>

diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml index c4a8d03d4..ed42d3478 100644 --- a/app/views/settings/edit.rhtml +++ b/app/views/settings/edit.rhtml @@ -21,7 +21,7 @@ <%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %>

-<%= check_box_tag 'settings[password_lost]', 1, Setting.password_lost? %><%= hidden_field_tag 'settings[password_lost]', 0 %>

+<%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %>

<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB

diff --git a/config/settings.yml b/config/settings.yml index 252600b58..7ddbe5293 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -29,7 +29,7 @@ login_required: default: 0 self_registration: default: 1 -password_lost: +lost_password: default: 1 attachment_max_size: format: int