From c0554308dcb57b08335a0ee4b2e2512f0b05fba0 Mon Sep 17 00:00:00 2001 From: Bob Maerten Date: Fri, 8 May 2015 21:17:58 +0200 Subject: [PATCH] Remove remaining inherited_resources code --- app/controllers/admin/topics_controller.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/topics_controller.rb b/app/controllers/admin/topics_controller.rb index 02ec8e00..dcecb3d1 100644 --- a/app/controllers/admin/topics_controller.rb +++ b/app/controllers/admin/topics_controller.rb @@ -5,13 +5,16 @@ class Admin::TopicsController < ApplicationController before_filter :set_navigation_ids def show - show! do - @comments = @topic.comments.page(params[:page]) - end + @topic = Topic.find(params[:id]) + authorize! :read, @topic + @comments = @topic.comments.page(params[:page]) end def destroy - destroy! { admin_site_path(@topic.site) } + @topic = Topic.find(params[:id]) + authorize! :destroy, @topic + @topic.destroy + redirect_to admin_site_path(@topic.site) end def index