Skip to content

Commit fa96250

Browse files
committed
Merge pull request activeadmin#226 from shayfrendt/skip_before_filter
Add support for skip_before_filter to the DSL
2 parents e63b402 + b785a17 commit fa96250

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

lib/active_admin/application.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ def before_filter(*args, &block)
158158
ResourceController.before_filter(*args, &block)
159159
end
160160

161+
def skip_before_filter(*args, &block)
162+
ResourceController.skip_before_filter(*args, &block)
163+
end
164+
161165
def after_filter(*args, &block)
162166
ResourceController.after_filter(*args, &block)
163167
end

lib/active_admin/dsl.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def collection_action(name, options = {}, &block)
207207

208208

209209
# Standard rails filters
210-
delegate :before_filter, :after_filter, :around_filter, :to => :controller
210+
delegate :before_filter, :skip_before_filter, :after_filter, :around_filter, :to => :controller
211211

212212
# Specify which actions to create in the controller
213213
#

spec/unit/controller_filters_spec.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99
application.before_filter :my_filter, :only => :show
1010
end
1111
end
12+
13+
describe "skip before filters" do
14+
it "should add a new skip before filter to ActiveAdmin::ResourceController" do
15+
ActiveAdmin::ResourceController.should_receive(:skip_before_filter).and_return(true)
16+
application.skip_before_filter :my_filter, :only => :show
17+
end
18+
end
1219

1320
describe "after filters" do
1421
it "should add a new after filter to ActiveAdmin::ResourceController" do

0 commit comments

Comments
 (0)