Merge pull request #351 from kfarst/develop

Allow classified sorting without an ID column
ctran · Feb 26, 2016 · 15e699e · 15e699e
2 parents c7615d4 + 9e94392
commit 15e699e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/annotate/annotate_models.rb b/lib/annotate/annotate_models.rb
@@ -671,7 +671,7 @@ def classified_sort(cols)
       end
       [rest_cols, timestamps, associations].each {|a| a.sort_by!(&:name) }
 
-      return ([id] << rest_cols << timestamps << associations).flatten
+      return ([id] << rest_cols << timestamps << associations).flatten.compact
     end
 
     # Ignore warnings for the duration of the block ()