diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-23 16:13:25 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-23 16:13:25 +0000 |
| commit | 3320e651d36b0c44e1f3f5366082c0d184408f6f (patch) | |
| tree | b17e4a7720f757ff20fcdfd75fa9ae421b2a7c6b | |
| parent | 216cd861c2fedbfdcc7e2551e77355faf024a080 (diff) | |
| download | redmine-3320e651d36b0c44e1f3f5366082c0d184408f6f.tar.gz redmine-3320e651d36b0c44e1f3f5366082c0d184408f6f.zip | |
Remove ActiveRecord workaround (#26323).
git-svn-id: http://svn.redmine.org/redmine/trunk@16869 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/query.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index fc6f97a6c..b297a6973 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -934,12 +934,7 @@ class Query < ActiveRecord::Base def grouped_query(&block) r = nil if grouped? - begin - # Rails3 will raise an (unexpected) RecordNotFound if there's only a nil group value - r = yield base_group_scope - rescue ActiveRecord::RecordNotFound - r = {nil => yield(base_scope)} - end + r = yield base_group_scope c = group_by_column if c.is_a?(QueryCustomFieldColumn) r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h} |