From e47daca26c5861d09c8248855472d4e65cbda1d0 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Mon, 19 Jan 2015 16:49:14 -0300 Subject: [PATCH] Use default base class for plugin admin controllers --- plugins/anti_spam/controllers/anti_spam_plugin_admin_controller.rb | 2 +- plugins/foo/controllers/admin/foo_plugin_admin_bar_controller.rb | 2 +- plugins/ldap/controllers/ldap_plugin_admin_controller.rb | 2 +- plugins/piwik/controllers/piwik_plugin_admin_controller.rb | 2 +- plugins/vote/controllers/vote_plugin_admin_controller.rb | 2 +- plugins/vote/test/functional/vote_plugin_admin_controller_test.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/anti_spam/controllers/anti_spam_plugin_admin_controller.rb b/plugins/anti_spam/controllers/anti_spam_plugin_admin_controller.rb index 8787a7f..4aea5c9 100644 --- a/plugins/anti_spam/controllers/anti_spam_plugin_admin_controller.rb +++ b/plugins/anti_spam/controllers/anti_spam_plugin_admin_controller.rb @@ -1,4 +1,4 @@ -class AntiSpamPluginAdminController < AdminController +class AntiSpamPluginAdminController < PluginAdminController append_view_path File.join(File.dirname(__FILE__) + '/../views') def index diff --git a/plugins/foo/controllers/admin/foo_plugin_admin_bar_controller.rb b/plugins/foo/controllers/admin/foo_plugin_admin_bar_controller.rb index 14283ca..c77d06a 100644 --- a/plugins/foo/controllers/admin/foo_plugin_admin_bar_controller.rb +++ b/plugins/foo/controllers/admin/foo_plugin_admin_bar_controller.rb @@ -1,3 +1,3 @@ -class FooPluginAdminBarController < AdminController +class FooPluginAdminBarController < PluginAdminController end diff --git a/plugins/ldap/controllers/ldap_plugin_admin_controller.rb b/plugins/ldap/controllers/ldap_plugin_admin_controller.rb index 4092132..207f178 100644 --- a/plugins/ldap/controllers/ldap_plugin_admin_controller.rb +++ b/plugins/ldap/controllers/ldap_plugin_admin_controller.rb @@ -1,4 +1,4 @@ -class LdapPluginAdminController < AdminController +class LdapPluginAdminController < PluginAdminController append_view_path File.join(File.dirname(__FILE__) + '/../views') diff --git a/plugins/piwik/controllers/piwik_plugin_admin_controller.rb b/plugins/piwik/controllers/piwik_plugin_admin_controller.rb index b7d5d38..906af94 100644 --- a/plugins/piwik/controllers/piwik_plugin_admin_controller.rb +++ b/plugins/piwik/controllers/piwik_plugin_admin_controller.rb @@ -1,4 +1,4 @@ -class PiwikPluginAdminController < AdminController +class PiwikPluginAdminController < PluginAdminController append_view_path File.join(File.dirname(__FILE__) + '/../views') diff --git a/plugins/vote/controllers/vote_plugin_admin_controller.rb b/plugins/vote/controllers/vote_plugin_admin_controller.rb index 3a8cd88..640d750 100644 --- a/plugins/vote/controllers/vote_plugin_admin_controller.rb +++ b/plugins/vote/controllers/vote_plugin_admin_controller.rb @@ -1,4 +1,4 @@ -class VotePluginAdminController < AdminController +class VotePluginAdminController < PluginAdminController def index settings = params[:settings] diff --git a/plugins/vote/test/functional/vote_plugin_admin_controller_test.rb b/plugins/vote/test/functional/vote_plugin_admin_controller_test.rb index 3412a21..35395f7 100644 --- a/plugins/vote/test/functional/vote_plugin_admin_controller_test.rb +++ b/plugins/vote/test/functional/vote_plugin_admin_controller_test.rb @@ -8,7 +8,7 @@ class VotePluginAdminControllerTest < ActionController::TestCase def setup @environment = Environment.default - @profile = create_user('profile').person + @profile = create_user_with_permission('profile', 'edit_environment_features', Environment.default) login_as(@profile.identifier) end -- libgit2 0.21.2