From 93c6a41f36472cd23f2b7fc68938f904cfbec063 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Sat, 15 Sep 2007 19:00:34 +0000 Subject: [PATCH] ActionItem65: creating base controllers and making the ones in the folders inherit from them --- app/controllers/environment_admin/admin_panel_controller.rb | 2 +- app/controllers/environment_admin/edit_template_controller.rb | 2 +- app/controllers/environment_admin/features_controller.rb | 2 +- app/controllers/environment_admin/manage_tags_controller.rb | 2 +- app/controllers/environment_admin/role_controller.rb | 2 +- app/controllers/environment_admin_controller.rb | 2 ++ app/controllers/profile_admin/enterprise_controller.rb | 2 +- app/controllers/profile_admin/profile_editor_controller.rb | 2 +- app/controllers/profile_admin_controller.rb | 2 ++ app/controllers/public/account_controller.rb | 2 +- app/controllers/public/content_viewer_controller.rb | 2 +- app/controllers/public/home_controller.rb | 2 +- app/controllers/public_controller.rb | 2 ++ app/controllers/system_admin_controller.rb | 2 ++ test/functional/environment_admin_controller_test.rb | 18 ++++++++++++++++++ test/functional/profile_admin_controller_test.rb | 18 ++++++++++++++++++ test/functional/public_controller_test.rb | 18 ++++++++++++++++++ test/functional/system_admin_controller_test.rb | 18 ++++++++++++++++++ 18 files changed, 90 insertions(+), 10 deletions(-) create mode 100644 app/controllers/environment_admin_controller.rb create mode 100644 app/controllers/profile_admin_controller.rb create mode 100644 app/controllers/public_controller.rb create mode 100644 app/controllers/system_admin_controller.rb create mode 100644 test/functional/environment_admin_controller_test.rb create mode 100644 test/functional/profile_admin_controller_test.rb create mode 100644 test/functional/public_controller_test.rb create mode 100644 test/functional/system_admin_controller_test.rb diff --git a/app/controllers/environment_admin/admin_panel_controller.rb b/app/controllers/environment_admin/admin_panel_controller.rb index 54473ac..3e6c33a 100644 --- a/app/controllers/environment_admin/admin_panel_controller.rb +++ b/app/controllers/environment_admin/admin_panel_controller.rb @@ -1,2 +1,2 @@ -class AdminPanelController < ApplicationController +class AdminPanelController < EnvironmentAdminController end diff --git a/app/controllers/environment_admin/edit_template_controller.rb b/app/controllers/environment_admin/edit_template_controller.rb index f863eea..2bc233b 100644 --- a/app/controllers/environment_admin/edit_template_controller.rb +++ b/app/controllers/environment_admin/edit_template_controller.rb @@ -1,4 +1,4 @@ -class EditTemplateController < ApplicationController +class EditTemplateController < EnvironmentAdminController design_editor :holder => 'virtual_community', :autosave => true, :block_types => :block_types diff --git a/app/controllers/environment_admin/features_controller.rb b/app/controllers/environment_admin/features_controller.rb index a306824..26c8e59 100644 --- a/app/controllers/environment_admin/features_controller.rb +++ b/app/controllers/environment_admin/features_controller.rb @@ -1,4 +1,4 @@ -class FeaturesController < ApplicationController +class FeaturesController < EnvironmentAdminController acts_as_virtual_community_admin_controller diff --git a/app/controllers/environment_admin/manage_tags_controller.rb b/app/controllers/environment_admin/manage_tags_controller.rb index c5794a4..89a9cbd 100644 --- a/app/controllers/environment_admin/manage_tags_controller.rb +++ b/app/controllers/environment_admin/manage_tags_controller.rb @@ -1,5 +1,5 @@ # Manage tags stored by the acts-as_taggable_on_steroids plugin by providing an interface to create, destroy, update and list them -class ManageTagsController < ApplicationController +class ManageTagsController < EnvironmentAdminController # Index redirects to list action without modifing the url def index diff --git a/app/controllers/environment_admin/role_controller.rb b/app/controllers/environment_admin/role_controller.rb index 7063e8f..a69cd8c 100644 --- a/app/controllers/environment_admin/role_controller.rb +++ b/app/controllers/environment_admin/role_controller.rb @@ -1,4 +1,4 @@ -class RoleController < ApplicationController +class RoleController < EnvironmentAdminController def index @roles = Role.find(:all) end diff --git a/app/controllers/environment_admin_controller.rb b/app/controllers/environment_admin_controller.rb new file mode 100644 index 0000000..95d7452 --- /dev/null +++ b/app/controllers/environment_admin_controller.rb @@ -0,0 +1,2 @@ +class EnvironmentAdminController < ApplicationController +end diff --git a/app/controllers/profile_admin/enterprise_controller.rb b/app/controllers/profile_admin/enterprise_controller.rb index 7da4fe8..7d2e767 100644 --- a/app/controllers/profile_admin/enterprise_controller.rb +++ b/app/controllers/profile_admin/enterprise_controller.rb @@ -1,5 +1,5 @@ # Manage enterprises by providing an interface to register, activate and manage them -class EnterpriseController < ApplicationController +class EnterpriseController < ProfileAdminController before_filter :logon, :my_enterprises diff --git a/app/controllers/profile_admin/profile_editor_controller.rb b/app/controllers/profile_admin/profile_editor_controller.rb index 729a312..366aea9 100644 --- a/app/controllers/profile_admin/profile_editor_controller.rb +++ b/app/controllers/profile_admin/profile_editor_controller.rb @@ -1,4 +1,4 @@ -class ProfileEditorController < ApplicationController +class ProfileEditorController < ProfileAdminController helper :profile # edits the profile info (posts back) diff --git a/app/controllers/profile_admin_controller.rb b/app/controllers/profile_admin_controller.rb new file mode 100644 index 0000000..88ffaf4 --- /dev/null +++ b/app/controllers/profile_admin_controller.rb @@ -0,0 +1,2 @@ +class ProfileAdminController < ApplicationController +end diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb index a20ea3a..f855771 100644 --- a/app/controllers/public/account_controller.rb +++ b/app/controllers/public/account_controller.rb @@ -1,4 +1,4 @@ -class AccountController < ApplicationController +class AccountController < PublicController # say something nice, you goof! something sweet. def index diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb index 9788aca..4de5307 100644 --- a/app/controllers/public/content_viewer_controller.rb +++ b/app/controllers/public/content_viewer_controller.rb @@ -1,4 +1,4 @@ -class ContentViewerController < ApplicationController +class ContentViewerController < PublicController def view_page path = params[:page].clone diff --git a/app/controllers/public/home_controller.rb b/app/controllers/public/home_controller.rb index 9800738..ad7ca17 100644 --- a/app/controllers/public/home_controller.rb +++ b/app/controllers/public/home_controller.rb @@ -1,4 +1,4 @@ -class HomeController < ApplicationController +class HomeController < PublicController design :holder => 'virtual_community' diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb new file mode 100644 index 0000000..2857026 --- /dev/null +++ b/app/controllers/public_controller.rb @@ -0,0 +1,2 @@ +class PublicController < ApplicationController +end diff --git a/app/controllers/system_admin_controller.rb b/app/controllers/system_admin_controller.rb new file mode 100644 index 0000000..70751d4 --- /dev/null +++ b/app/controllers/system_admin_controller.rb @@ -0,0 +1,2 @@ +class SystemAdminController < ApplicationController +end diff --git a/test/functional/environment_admin_controller_test.rb b/test/functional/environment_admin_controller_test.rb new file mode 100644 index 0000000..81070bb --- /dev/null +++ b/test/functional/environment_admin_controller_test.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'environment_admin_controller' + +# Re-raise errors caught by the controller. +class EnvironmentAdminController; def rescue_action(e) raise e end; end + +class EnvironmentAdminControllerTest < Test::Unit::TestCase + def setup + @controller = EnvironmentAdminController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + # Replace this with your real tests. + def test_truth + assert true + end +end diff --git a/test/functional/profile_admin_controller_test.rb b/test/functional/profile_admin_controller_test.rb new file mode 100644 index 0000000..51a4bd8 --- /dev/null +++ b/test/functional/profile_admin_controller_test.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'profile_admin_controller' + +# Re-raise errors caught by the controller. +class ProfileAdminController; def rescue_action(e) raise e end; end + +class ProfileAdminControllerTest < Test::Unit::TestCase + def setup + @controller = ProfileAdminController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + # Replace this with your real tests. + def test_truth + assert true + end +end diff --git a/test/functional/public_controller_test.rb b/test/functional/public_controller_test.rb new file mode 100644 index 0000000..6b74720 --- /dev/null +++ b/test/functional/public_controller_test.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'public_controller' + +# Re-raise errors caught by the controller. +class PublicController; def rescue_action(e) raise e end; end + +class PublicControllerTest < Test::Unit::TestCase + def setup + @controller = PublicController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + # Replace this with your real tests. + def test_truth + assert true + end +end diff --git a/test/functional/system_admin_controller_test.rb b/test/functional/system_admin_controller_test.rb new file mode 100644 index 0000000..2d0da2f --- /dev/null +++ b/test/functional/system_admin_controller_test.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'system_admin_controller' + +# Re-raise errors caught by the controller. +class SystemAdminController; def rescue_action(e) raise e end; end + +class SystemAdminControllerTest < Test::Unit::TestCase + def setup + @controller = SystemAdminController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + # Replace this with your real tests. + def test_truth + assert true + end +end -- libgit2 0.21.2