Actions listed in TEXT feeds are now sorted in the same order as they are on the home page. Also fixed a bug where an action marked complete and then unmarked complete would be shown as complete on the TEXT feed. This addresses Jeroen van der Ham's mailing list query. Create a Trac ticket next time please, Jeroen. :-)

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@311 a4c988fc-2ded-0310-b66e-134b36920a42

tracks/app/controllers/feed_controller.rb

@@ -127,6 +127,7 @@ protected
     end
   
     options[:conditions] = condition_builder.to_conditions
+    options[:order] = "todos.due IS NULL, todos.due ASC, todos.created_at ASC"
     options[:include] = :project
     
     @todos = @user.todos.find(:all, options )

tracks/app/helpers/feed_helper.rb

@@ -11,7 +11,7 @@ module FeedHelper
       if item.context_id == context.id
         result_string << "\n" + context.name.upcase + ":\n" if result_string.empty?
       
-        if item.completed
+        if (item.done == 1 || item.done == true) && item.completed
           result_string << "    [Completed: " + format_date(item.completed) + "] "
         end