From e3b064638c430daaa829770bb6e01115047d0873 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sun, 6 Sep 2020 02:25:22 +0300 Subject: [PATCH] #2471: Fix a syntax error probably caused by c66ce02cb when @original_item is nil --- app/controllers/todos_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 99789289..aa629cda 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -309,7 +309,7 @@ class TodosController < ApplicationController @source_view = params['_source_view'] || 'todo' # 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) @todo_was_completed_from_deferred_or_blocked_state = @@ -940,7 +940,7 @@ end @down_count = current_user.todos.active.not_hidden.count end 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 if @todo.context.hidden?