diff options
author | thedarkone <thedarkone2@gmail.com> | 2012-06-30 17:09:12 +0200 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-10-18 16:17:08 -0700 |
commit | 7cc5bf51b4c16e89340b8c45ca0297e387226aaf (patch) | |
tree | fa65abc0b2d32c21d79b4585ef1ce14c2ba5467b | |
parent | 872d8c30971e376cf6d2f7b99a0aafdb7bfc1939 (diff) | |
download | rails-7cc5bf51b4c16e89340b8c45ca0297e387226aaf.tar.gz rails-7cc5bf51b4c16e89340b8c45ca0297e387226aaf.tar.bz2 rails-7cc5bf51b4c16e89340b8c45ca0297e387226aaf.zip |
There is already a Set of non-hidden action_names lying around.
-rw-r--r-- | actionpack/lib/action_controller/metal/hide_actions.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb index 420b22cf56..2aa6b7adaf 100644 --- a/actionpack/lib/action_controller/metal/hide_actions.rb +++ b/actionpack/lib/action_controller/metal/hide_actions.rb @@ -26,20 +26,14 @@ module ActionController self.hidden_actions = hidden_actions.dup.merge(args.map(&:to_s)).freeze end - def inherited(klass) - klass.class_eval { @visible_actions = {} } - super - end - def visible_action?(action_name) - return @visible_actions[action_name] if @visible_actions.key?(action_name) - @visible_actions[action_name] = !hidden_actions.include?(action_name) + action_methods.include?(action_name) end # Overrides AbstractController::Base#action_methods to remove any methods # that are listed as hidden methods. def action_methods - @action_methods ||= Set.new(super.reject { |name| hidden_actions.include?(name) }) + @action_methods ||= Set.new(super.reject { |name| hidden_actions.include?(name) }).freeze end end end |