Merged rails2-branch back into trunk. Trunk Tracks is now using Rails 2.0.2.

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@837 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
lukemelia 2008-04-28 05:53:24 +00:00
parent 5d2023d18b
commit 76aba636a9
1167 changed files with 59656 additions and 32986 deletions

View file

@ -18,7 +18,7 @@ class ContextsController < ApplicationController
format.xml { render :xml => @contexts.to_xml( :except => :user_id ) }
format.rss &render_contexts_rss_feed
format.atom &render_contexts_atom_feed
format.text { render :action => 'index_text', :layout => false, :content_type => Mime::TEXT }
format.text { render :action => 'index', :layout => false, :content_type => Mime::TEXT }
end
end
@ -84,7 +84,9 @@ class ContextsController < ApplicationController
@context.attributes = params["context"]
if @context.save
if params['wants_render']
render
respond_to do |format|
format.js
end
else
render :text => success_text || 'Success'
end
@ -179,7 +181,7 @@ class ContextsController < ApplicationController
def init_todos
set_context_from_params
unless @context.nil?
@context.todos.with_scope :find => { :include => [:project, :tags] } do
@context.todos.send :with_scope, :find => { :include => [:project, :tags] } do
@done = @context.done_todos
end