mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-30 22:08:49 +01:00
#923: Applied make-toggle-work-after-drag-and-drop.diff patch from Reinier.
This commit is contained in:
parent
dc08cbe76f
commit
406ce7ff2c
3 changed files with 14 additions and 3 deletions
|
|
@ -141,6 +141,7 @@ class TodosController < ApplicationController
|
|||
end
|
||||
|
||||
def add_predecessor
|
||||
@source_view = params['_source_view'] || 'todo'
|
||||
@predecessor = Todo.find(params['predecessor'])
|
||||
@todo = Todo.find(params['successor'])
|
||||
@original_state = @todo.state
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ draggable_element(dom_id(todo), :revert => "'true'", :handle => "'grip'", :onDr
|
|||
<%=
|
||||
drop_receiving_element(dom_id(todo),
|
||||
:url => {:controller => "todos", :action => "add_predecessor"},
|
||||
:with => "'successor=' + encodeURIComponent(element.id.split('_').last()) + '&predecessor=' + encodeURIComponent(#{todo.id})",
|
||||
:with => "'#{parameters}&successor=' + encodeURIComponent(element.id.split('_').last()) + '&predecessor=' + encodeURIComponent(#{todo.id})",
|
||||
:hoverclass => 'hover'
|
||||
)
|
||||
%>
|
||||
|
|
|
|||
|
|
@ -3,9 +3,19 @@ if @saved
|
|||
status_message = "Added #{@predecessor.description} as dependency."
|
||||
unless @original_state == 'pending'
|
||||
status_message += " #{@todo.description} set to pending"
|
||||
# remove successor from page
|
||||
page[@todo].remove
|
||||
page['tickler-empty-nd'].hide
|
||||
page.insert_html :bottom, item_container_id(@todo), :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
|
||||
# regenerate predecessor to add arrow
|
||||
page[@predecessor].replace_html :partial => 'todos/todo', :locals => { :todo => @predecessor, :parent_container_type => parent_container_type }
|
||||
|
||||
# show in tickler box in project view
|
||||
if source_view_is_one_of :project, :tag
|
||||
page['tickler-empty-nd'].hide
|
||||
page.insert_html :bottom, "tickler", :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type }
|
||||
end
|
||||
|
||||
page << "TodoBehavior.enableToggleNotes();"
|
||||
page << "TodoBehavior.enableToggleSuccessors();"
|
||||
end
|
||||
page.notify :notice, status_message, 5.0
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue