diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 58d9ac9f..eac02c1d 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -470,7 +470,7 @@ class TodosController < ApplicationController def update @todo = current_user.todos.find_by_id(params['id']) @source_view = params['_source_view'] || 'todo' - init_data_for_sidebar unless mobile? + # init_data_for_sidebar unless mobile? cache_attributes_from_before_update @@ -497,6 +497,8 @@ class TodosController < ApplicationController determine_down_count determine_deferred_tag_count(params['_tag_name']) if source_view_is(:tag) + @todo.touch_predecessors if @original_item_description != @todo.description + respond_to do |format| format.js { @status_message = @todo.deferred? ? t('todos.action_saved_to_tickler') : t('todos.action_saved') @@ -1196,6 +1198,7 @@ class TodosController < ApplicationController @original_item_due = @todo.due @original_item_due_id = get_due_id_for_calendar(@todo.due) @original_item_predecessor_list = @todo.predecessors.map{|t| t.specification}.join(', ') + @original_item_description = @todo.description @todo_was_deferred_or_blocked = @todo.deferred? || @todo.pending? end diff --git a/app/models/todo.rb b/app/models/todo.rb index 526ef0d7..709b5d47 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -172,6 +172,11 @@ class Todo < ActiveRecord::Base end end + def touch_predecessors + self.touch + predecessors.each { |p| p.touch_predecessors } + end + def removed_predecessors return @removed_predecessors end diff --git a/app/views/todos/_successor.html.erb b/app/views/todos/_successor.html.erb index 4d26a7d2..0b932012 100644 --- a/app/views/todos/_successor.html.erb +++ b/app/views/todos/_successor.html.erb @@ -1,13 +1,7 @@ <% -suppress_context ||= false -suppress_project ||= false -suppress_dependencies ||= false -parameters = "_source_view=#{@source_view}" -parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag' -@z_index_counter = @z_index_counter - 1 # for IE z-index bug @rec_depth ||= 0 -cache successor do +cache [successor, "successor"] do %>