From cd469264bd1b94af33ee71c4e5b55e0aa791adfc Mon Sep 17 00:00:00 2001 From: Skud Date: Fri, 1 Feb 2013 11:21:13 +1100 Subject: [PATCH] this seems to mostly work --- app/controllers/application_controller.rb | 1 - app/controllers/crops_controller.rb | 1 + app/controllers/gardens_controller.rb | 1 + app/controllers/home_controller.rb | 1 + app/controllers/members_controller.rb | 1 + app/controllers/plantings_controller.rb | 1 + app/controllers/posts_controller.rb | 1 + app/controllers/scientific_names_controller.rb | 1 + 8 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7b9467a97..7b9c6fa50 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,5 @@ class ApplicationController < ActionController::Base protect_from_forgery - load_and_authorize_resource # tweak CanCan defaults because we don't have a "current_user" method def current_ability diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb index 648fde43a..42d3ef0d7 100644 --- a/app/controllers/crops_controller.rb +++ b/app/controllers/crops_controller.rb @@ -1,4 +1,5 @@ class CropsController < ApplicationController + load_and_authorize_resource # GET /crops # GET /crops.json diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index b0f37c3d6..edc82cd84 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -1,4 +1,5 @@ class GardensController < ApplicationController + load_and_authorize_resource # GET /gardens # GET /gardens.json def index diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 95f29929c..26348c670 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,4 +1,5 @@ class HomeController < ApplicationController + skip_authorize_resource def index end end diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index daeea9fdf..f53faded3 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -1,4 +1,5 @@ class MembersController < ApplicationController + load_and_authorize_resource def index @members = Member.confirmed diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb index 4027345cc..2158719d8 100644 --- a/app/controllers/plantings_controller.rb +++ b/app/controllers/plantings_controller.rb @@ -1,4 +1,5 @@ class PlantingsController < ApplicationController + load_and_authorize_resource # GET /plantings # GET /plantings.json def index diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 1553259f3..4a7c2700a 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -1,4 +1,5 @@ class PostsController < ApplicationController + load_and_authorize_resource # GET /posts # GET /posts.json diff --git a/app/controllers/scientific_names_controller.rb b/app/controllers/scientific_names_controller.rb index 8e37c6670..b54cac6af 100644 --- a/app/controllers/scientific_names_controller.rb +++ b/app/controllers/scientific_names_controller.rb @@ -1,4 +1,5 @@ class ScientificNamesController < ApplicationController + load_and_authorize_resource # GET /scientific_names # GET /scientific_names.json def index