@@ -227,7 +227,7 class Query < ActiveRecord::Base | |||
|
227 | 227 | end |
|
228 | 228 | |
|
229 | 229 | def label_for(field) |
|
230 |
label = |
|
|
230 | label = available_filters[field][:name] if available_filters.has_key?(field) | |
|
231 | 231 | label ||= field.gsub(/\_id$/, "") |
|
232 | 232 | end |
|
233 | 233 |
@@ -116,6 +116,11 class QueryTest < Test::Unit::TestCase | |||
|
116 | 116 | assert q.has_column?(c) |
|
117 | 117 | end |
|
118 | 118 | |
|
119 | def test_label_for | |
|
120 | q = Query.new | |
|
121 | assert_equal 'assigned_to', q.label_for('assigned_to_id') | |
|
122 | end | |
|
123 | ||
|
119 | 124 | def test_editable_by |
|
120 | 125 | admin = User.find(1) |
|
121 | 126 | manager = User.find(2) |
General Comments 0
You need to be logged in to leave comments.
Login now