diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-07 17:26:22 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-07 17:26:22 +0000 |
| commit | b0be968d36f530e4822733f2e012c6a3bdc6076e (patch) | |
| tree | 596d57b262a1220a8a114a1174e4427ce05dc177 /app/views/settings | |
| parent | 31a976c925ad5cb71351a58fad92329dacac2ede (diff) | |
| download | redmine-b0be968d36f530e4822733f2e012c6a3bdc6076e.tar.gz redmine-b0be968d36f530e4822733f2e012c6a3bdc6076e.zip | |
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
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/_authentication.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
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> |