Skip to content

Commit

Permalink
Fixes issue when using id_column in json_for_jqgrid method.
Browse files Browse the repository at this point in the history
  • Loading branch information
Juanmcuello committed Jun 8, 2011
1 parent 40ba496 commit 989ba9f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.rdoc
Expand Up @@ -2,6 +2,9 @@
* A proc is now accepted by id_column option in json_for_jqgrid method.
* Allow the column name in the 'order_by' helper to be quoted.

* bug fixes
* Fixes issue when using id_column in json_for_jqgrid method.

== 1.0.1

* enhancements
Expand Down
2 changes: 1 addition & 1 deletion lib/jqgrid_for_rails/controllers/helpers.rb
Expand Up @@ -136,7 +136,7 @@ def id_column_from_options record, options
if options[:id_column].class.to_s == 'Proc'
options[:id_column].call(record)
else
record.attributes[[options[:id_column]]]
record.attributes[options[:id_column]]
end
end

Expand Down

0 comments on commit 989ba9f

Please sign in to comment.