From f3529e78c922a7d23709d3ce72cb9734993632d6 Mon Sep 17 00:00:00 2001 From: lukemelia Date: Tue, 29 Apr 2008 04:52:20 +0000 Subject: [PATCH] Fix #704, todo items failing to disappear. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@838 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/helpers/todos_helper.rb | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/tracks/app/helpers/todos_helper.rb b/tracks/app/helpers/todos_helper.rb index 9d65c2c4..d171f746 100644 --- a/tracks/app/helpers/todos_helper.rb +++ b/tracks/app/helpers/todos_helper.rb @@ -23,18 +23,15 @@ module TodosHelper end def remote_delete_icon - if @source_view == 'tag' - parameters = "{ _source_view : '#{@source_view}', _tag_name : '#{@tag_name}' }" - else - parameters = "{ _source_view : '#{@source_view}' }" - end + parameters = "_source_view=#{@source_view}" + parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag' str = link_to( image_tag_for_delete, todo_path(@todo), :id => "delete_icon_"+@todo.id.to_s, :class => "icon delete_icon", :title => "delete the action '#{@todo.description}'") apply_behavior '.item-container a.delete_icon:click', :prevent_default => true do |page| page.confirming "'Are you sure that you want to ' + this.title + '?'" do page << "itemContainer = this.up('.item-container'); itemContainer.startWaiting();" - page << remote_to_href(:method => 'delete', :with => parameters, :complete => "itemContainer.stopWaiting();") + page << remote_to_href(:method => 'delete', :with => "'#{parameters}'", :complete => "itemContainer.stopWaiting();") end end str @@ -51,18 +48,15 @@ module TodosHelper end def remote_edit_icon - if @source_view == 'tag' - parameters = "{ _source_view : '#{@source_view}', _tag_name : '#{@tag_name}' }" - else - parameters = "{ _source_view : '#{@source_view}' }" - end + parameters = "_source_view=#{@source_view}" + parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag' if !@todo.completed? str = link_to( image_tag_for_edit, edit_todo_path(@todo), :class => "icon edit_icon") apply_behavior '.item-container a.edit_icon:click', :prevent_default => true do |page| page << "Effect.Pulsate(this);" - page << remote_to_href(:method => 'get', :with => parameters) + page << remote_to_href(:method => 'get', :with => "'#{parameters}'") end else str = '' + image_tag("blank.png") + " " @@ -72,14 +66,11 @@ module TodosHelper def remote_toggle_checkbox str = check_box_tag('item_id', toggle_check_todo_path(@todo), @todo.completed?, :class => 'item-checkbox') - if @source_view == 'tag' - parameters = "{ _source_view : '#{@source_view}', _tag_name : '#{@tag_name}' }" - else - parameters = "{ _source_view : '#{@source_view}' }" - end + parameters = "_source_view=#{@source_view}" + parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag' apply_behavior '.item-container input.item-checkbox:click', remote_function(:url => javascript_variable('this.value'), :method => 'put', - :with => parameters) + :with => "'#{parameters}'") str end