ricky/stopwatch
1
0
Fork 0
mirror of https://github.com/rickbarrette/stopwatch.git synced 2026-04-02 09:51:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

always show the running timer in the timers list #5

Browse Source
This commit is contained in:
Jens Kraemer
2021-08-31 14:24:24 +08:00
parent 9802307e5e
commit 6c51ef795a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/stopwatch_timers_controller.rb
View File

@@ -86,7 +86,9 @@ class StopwatchTimersController < ApplicationController
end
def load_todays_entries
@entries = time_entries.where(spent_on: User.current.today).order(created_on: :asc)
@entries = time_entries.where(spent_on: User.current.today).or(
time_entries.where(id: User.current.running_time_entry_id)
).order(created_on: :asc)
end
def time_entries