diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ff167b0a38..88bcda3986 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -102,9 +102,9 @@ def set_current_user RequestStore.store[:current_user] = current_user end - def set_timeout_duration - @timeout_duration = current_user.timeout_in - end + # def set_timeout_duration + # @timeout_duration = current_user.timeout_in + # end def set_current_organization RequestStore.store[:current_organization] = current_organization diff --git a/app/javascript/src/session_timeout_poller.js b/app/javascript/src/session_timeout_poller.js index 83b96db9c7..1aa2edcb9d 100644 --- a/app/javascript/src/session_timeout_poller.js +++ b/app/javascript/src/session_timeout_poller.js @@ -1,4 +1,7 @@ const deviseTimeoutInMinutes = 180 +const timeoutDuration = 180; +// I could do this below if this is preferred +// const deviseTimeoutInMinutes = timeoutDuration || 180; const twoMinuteWarning = deviseTimeoutInMinutes - 2 const totalTimerAmount = twoMinuteWarning * 60 * 1000 const deviseTimeoutInMilliseconds = deviseTimeoutInMinutes * 60 * 1000 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5d5bc4b87d..5848479019 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,6 +15,7 @@ <%= og_tag :image, content: image_url('login.jpg') %> <%= render 'shared/favicons' %> + <% binding.pry %>