Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-10 11:18:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2014-01-07 21:01:55 +01:00
parent fa537fbeb0
commit eb1502d4e0
28 changed files with 385 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

2
db/migrate/046_fix_incorrectly_hidden_todos.rb
View file

@ -3,7 +3,7 @@ class FixIncorrectlyHiddenTodos < ActiveRecord::Migration
hidden_todos_without_project =
Todo.where(:state => 'project_hidden', :project_id => nil)
active_projects = Project.where(:state => 'active')
active_projects = Project.where(:state => 'active').select("id")
hidden_todos_in_active_projects =
Todo.where(:state => 'project_hidden').where("project_id IN (?)", active_projects)