Adds 4h, 8h and 12h as options for session maximum lifetime (#20933).

git-svn-id: http://svn.redmine.org/redmine/trunk@14647 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 49a6184206197882f2714ecfc4bce20c065a0288..c2c2e2fa5fd79b9fdc31401347a05e9b33a12cbe 100644 (file)
--- 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 3c5b1c1fe4fa0325a26d0d6a32eedf6b18d6b700..f9c569cb8545ee8b37b9d784d6b22deefa2e1159 100644 (file)
--- 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>