Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-25 11:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 1.7_branch

Browse source
This commit is contained in:
Reinier Balt 2009-01-06 09:54:24 +01:00
commit cd372afd10
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/todos_controller.rb
View file

@ -175,7 +175,10 @@ class TodosController < ApplicationController
def update
@source_view = params['_source_view'] || 'todo'
init_data_for_sidebar unless mobile?
@todo.tag_with(params[:tag_list]) if params[:tag_list]
if params[:tag_list]
@todo.tag_with(params[:tag_list])
@todo.tags(true) #force a reload for proper rendering
end
@original_item_context_id = @todo.context_id
@original_item_project_id = @todo.project_id
@original_item_was_deferred = @todo.deferred?

2
app/views/todos/edit.js.rjs
View file

@ -1,4 +1,4 @@
page[dom_id(@todo, 'form')].down('.placeholder').replace_html :partial => 'todos/edit_form'
page[dom_id(@todo, 'line')].hide
page[dom_id(@todo, 'edit')].show
page[dom_id(@todo, 'form')].down('table').down('input').focus
page[dom_id(@todo, 'form')].down('input#todo_description').focus