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

Added Luke's patch to honour the user's context ordering in the feeds.

Browse source 
Fixes #237.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@207 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
bsag 2006-03-22 18:35:08 +00:00
parent d7091d952e
commit 9e5f0a7c3e
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tracks/app/controllers/feed_controller.rb
View file

@ -30,7 +30,7 @@ class FeedController < ApplicationController
if @params.key?('context') if @params.key?('context')
@contexts = [ @user.contexts.find(@params['context']) ] @contexts = [ @user.contexts.find(@params['context']) ]
else else
@contexts = @user.contexts.find_all_by_hide(false) @contexts = @user.contexts.find_all_by_hide(false, "position ASC")
end end
@headers["Content-Type"] = "text/plain; charset=utf-8" @headers["Content-Type"] = "text/plain; charset=utf-8"
end end
@ -50,7 +50,7 @@ protected
condition_builder = FindConditionBuilder.new condition_builder = FindConditionBuilder.new
options = Hash.new options = Hash.new
condition_builder.add 'done = ?', false condition_builder.add 'todos.done = ?', false
if @params.key?('limit') if @params.key?('limit')
options[:limit] = limit = @params['limit'] options[:limit] = limit = @params['limit']
@ -61,7 +61,7 @@ protected
if @params.key?('due') if @params.key?('due')
due_within = @params['due'].to_i due_within = @params['due'].to_i
condition_builder.add('due <= ?', due_within.days.from_now) condition_builder.add('todos.due <= ?', due_within.days.from_now)
due_within_date_s = due_within.days.from_now.strftime("%Y-%m-%d") due_within_date_s = due_within.days.from_now.strftime("%Y-%m-%d")
@title << " due today" if (due_within == 0) @title << " due today" if (due_within == 0)
@title << " due within a week" if (due_within == 6) @title << " due within a week" if (due_within == 6)
@ -69,20 +69,21 @@ protected
end end
if @params.key?('context') if @params.key?('context')
context = context = @user.contexts.find(@params['context']) context = @user.contexts.find(@params['context'])
condition_builder.add('context_id = ?', context.id) condition_builder.add('todos.context_id = ?', context.id)
@title << " in #{context.name}" @title << " in #{context.name}"
@description << " in context '#{context.name}'" @description << " in context '#{context.name}'"
end end
if @params.key?('project') if @params.key?('project')
project = @user.projects.find(@params['project']) project = @user.projects.find(@params['project'])
condition_builder.add('project_id = ?', project.id) condition_builder.add('todos.project_id = ?', project.id)
@title << " for #{project.name}" @title << " for #{project.name}"
@description << " for project '#{project.name}'" @description << " for project '#{project.name}'"
end end
options[:conditions] = condition_builder.to_conditions options[:conditions] = condition_builder.to_conditions
options[:include] = :project
@todos = @user.todos.find(:all, options ) @todos = @user.todos.find(:all, options )