Merge branch 'master' into bug/1153_stats

This commit is contained in:
Jyri-Petteri Paloposki 2019-05-22 01:48:37 +03:00 committed by GitHub
commit dc0ca7239a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 21 deletions

View file

@ -27,6 +27,7 @@ module Todos
if params[:tag]
tag = Tag.where(:name => params[:tag]).first
return [] if !tag
not_done_todos = not_done_todos.joins(:taggings).where('taggings.tag_id = ?', tag.id)
end