diff options
| -rw-r--r-- | app/helpers/settings_helper.rb | 19 | ||||
| -rw-r--r-- | app/views/settings/_authentication.html.erb | 4 |
2 files changed, 21 insertions, 2 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 49a618420..c2c2e2fa5 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -111,6 +111,25 @@ module SettingsHelper content_tag(:label, tag + text, options) end + def session_lifetime_options + options = [[l(:label_disabled), 0]] + options += [4, 8, 12].map {|hours| + [l('datetime.distance_in_words.x_hours', :count => hours), (hours * 60).to_s] + } + options += [1, 7, 30, 60, 365].map {|days| + [l('datetime.distance_in_words.x_days', :count => days), (days * 24 * 60).to_s] + } + options + end + + def session_timeout_options + options = [[l(:label_disabled), 0]] + options += [1, 2, 4, 8, 12, 24, 48].map {|hours| + [l('datetime.distance_in_words.x_hours', :count => hours), (hours * 60).to_s] + } + options + end + def link_copied_issue_options options = [ [:general_text_Yes, 'yes'], diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb index 3c5b1c1fe..f9c569cb8 100644 --- a/app/views/settings/_authentication.html.erb +++ b/app/views/settings/_authentication.html.erb @@ -29,8 +29,8 @@ <legend><%= l(:label_session_expiration) %></legend> <div class="tabular settings"> - <p><%= setting_select :session_lifetime, [[l(:label_disabled), 0]] + [1, 7, 30, 60, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), (days * 60 * 24).to_s]} %></p> - <p><%= setting_select :session_timeout, [[l(:label_disabled), 0]] + [1, 2, 4, 8, 12, 24, 48].collect{|hours| [l('datetime.distance_in_words.x_hours', :count => hours), (hours * 60).to_s]} %></p> + <p><%= setting_select :session_lifetime, session_lifetime_options %></p> + <p><%= setting_select :session_timeout, session_timeout_options %></p> </div> <p><em class="info"><%= l(:text_session_expiration_settings) %></em></p> |