Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-14 08:26:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix failing tests

Browse source 
not sure if the to_a fixes to get collections from activerecord is the right way
This commit is contained in:
Reinier Balt 2014-04-11 22:47:36 +02:00
parent 35cab99cea
commit 2430fcb906
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -56,13 +56,13 @@ class User < ActiveRecord::Base
end
def alphabetize(scope_conditions = {})
projects = where(scope_conditions)
projects.sort!{ |x,y| x.name.downcase <=> y.name.downcase }
projects.to_a.sort!{ |x,y| x.name.downcase <=> y.name.downcase }
self.update_positions(projects.map{ |p| p.id })
return projects
end
def actionize(scope_conditions = {})
todos_in_project = where(scope_conditions).includes(:todos)
todos_in_project.sort!{ |x, y| -(x.todos.active.count <=> y.todos.active.count) }
todos_in_project.to_a.sort!{ |x, y| -(x.todos.active.count <=> y.todos.active.count) }
todos_in_project.reject{ |p| p.todos.active.count > 0 }
sorted_project_ids = todos_in_project.map {|p| p.id}