Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#2471: Fix a syntax error probably caused by c66ce02cb when @original_item is nil

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2020-09-06 02:25:22 +03:00
parent 294a6356fa
commit e3b064638c
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/todos_controller.rb
View file

@ -309,7 +309,7 @@ class TodosController < ApplicationController
@source_view = params['_source_view'] || 'todo' @source_view = params['_source_view'] || 'todo'
# Create a (unsaved) copy of the original todo, before it was toggled # Create a (unsaved) copy of the original todo, before it was toggled
@original_item = current_user.todos.build(@todo.attributes) @original_item = current_user.todos.build(@todo.attributes)
@original_completed_period = DoneTodos.completed_period(@todo.completed_at) @original_completed_period = DoneTodos.completed_period(@todo.completed_at)
@todo_was_completed_from_deferred_or_blocked_state = @todo_was_completed_from_deferred_or_blocked_state =
@ -940,7 +940,7 @@ end
@down_count = current_user.todos.active.not_hidden.count @down_count = current_user.todos.active.not_hidden.count
end end
from.context do from.context do
context_id = @original_item.context_id || @todo.context_id context_id = @original_item ? @original_item.context_id || @todo.context_id : @todo.context_id
todos = current_user.contexts.find(context_id).todos.not_completed todos = current_user.contexts.find(context_id).todos.not_completed
if @todo.context.hidden? if @todo.context.hidden?