Skip to content

Commit

Permalink
Exclude position column from all actions
Browse files Browse the repository at this point in the history
  • Loading branch information
scambra committed Apr 15, 2010
1 parent b564909 commit c443217
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/active_scaffold/actions/sortable.rb
Expand Up @@ -11,8 +11,9 @@ def self.included(base)
config.columns.each {|c| c.sort = false unless c.name == sortable_column }
config.list.sorting = { sortable_column => "asc" }

[:show, :list, :update, :create].each do |action_name|
config.send(action_name).columns.exclude(sortable_column) if config.actions.include?(action_name)
config.actions.each do |action_name|
action = config.send(action_name)
action.columns.exclude(sortable_column) if action.respond_to? :columns
end

dir = File.join(Rails.root, 'vendor', 'plugins', ::Sortable.plugin_name, 'frontends')
Expand Down
2 changes: 2 additions & 0 deletions test/config_test.rb
Expand Up @@ -23,6 +23,8 @@ def test_position_column_not_included
assert !AutoModelsController.active_scaffold_config.update.columns.include?(:position)
assert !AutoModelsController.active_scaffold_config.create.columns.include?(:position)
assert !AutoModelsController.active_scaffold_config.show.columns.include?(:position)
assert !AutoModelsController.active_scaffold_config.subform.columns.include?(:position)
assert !AutoModelsController.active_scaffold_config.search.columns.include?(:position)

assert !SortableModelsController.active_scaffold_config.list.columns.include?(:name)
assert !SortableModelsController.active_scaffold_config.update.columns.include?(:name)
Expand Down
1 change: 1 addition & 0 deletions test/controllers/sortable_models_controller.rb
@@ -1,5 +1,6 @@
class SortableModelsController < ActionController::Base
active_scaffold :model do |config|
config.actions.exclude :search
config.actions << :sortable
config.sortable.column = :name
end
Expand Down

0 comments on commit c443217

Please sign in to comment.