Prevents NoMethodError on @available_filters.has_key? in query.rb (#1178).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1454 e93f8b46-1217-0410-a6f0-8f06a7374b81

Prevents NoMethodError on @available_filters.has_key? in query.rb (#1178).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1454 e93f8b46-1217-0410-a6f0-8f06a7374b81
03f0236a · Jean-Philippe Lang · 02757f58 · 03f0236a · 03f0236a
Commit 03f0236a authored May 25, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

query.rb app/models/query.rb +1 -1

query_test.rb test/unit/query_test.rb +5 -0

No files found.
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -227,7 +227,7 @@ class Query < ActiveRecord::Base
  end
  
  def label_for(field)
-    label = @available_filters[field][:name] if @available_filters.has_key?(field)
+    label = available_filters[field][:name] if available_filters.has_key?(field)
    label ||= field.gsub(/\_id$/, "")
  end


--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -116,6 +116,11 @@ class QueryTest < Test::Unit::TestCase
    assert q.has_column?(c)
  end
  
+  def test_label_for
+    q = Query.new
+    assert_equal 'assigned_to', q.label_for('assigned_to_id')
+  end
+  
  def test_editable_by
    admin = User.find(1)
    manager = User.find(2)