From 7d3ad11a101c4798508ae489db45c89618aa2aac Mon Sep 17 00:00:00 2001
From: Ben Eggett <beneggett@gmail.com>
Date: Sat, 2 Jun 2012 03:34:00 -0600
Subject: [PATCH 1/2] Adjusted admin/config & admin/general_settings
 controllers class to explicitly inherit from Spree::Admin::BaseController

---
 core/app/controllers/spree/admin/configurations_controller.rb   | 2 +-
 core/app/controllers/spree/admin/general_settings_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/app/controllers/spree/admin/configurations_controller.rb b/core/app/controllers/spree/admin/configurations_controller.rb
index cfe8b33fa74..18db8e6402a 100644
--- a/core/app/controllers/spree/admin/configurations_controller.rb
+++ b/core/app/controllers/spree/admin/configurations_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class ConfigurationsController < BaseController
+    class ConfigurationsController < Spree::Admin::BaseController
 
     end
   end
diff --git a/core/app/controllers/spree/admin/general_settings_controller.rb b/core/app/controllers/spree/admin/general_settings_controller.rb
index ecee59d31ad..41b90f97b3d 100644
--- a/core/app/controllers/spree/admin/general_settings_controller.rb
+++ b/core/app/controllers/spree/admin/general_settings_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class GeneralSettingsController < BaseController
+    class GeneralSettingsController < Spree::Admin::BaseController
       def show
         @preferences = ['site_name', 'default_seo_title', 'default_meta_keywords',
                         'default_meta_description', 'site_url']

From 3c62e8e99088b968ad105d127ac4d76fdf732161 Mon Sep 17 00:00:00 2001
From: Ben Eggett <beneggett@gmail.com>
Date: Sat, 2 Jun 2012 08:59:49 -0600
Subject: [PATCH 2/2] Namespaced all other admin controllers that inheristed
 from < BaseController to explicitly inherit from Spree::Admin::BaseController

---
 core/app/controllers/spree/admin/image_settings_controller.rb   | 2 +-
 .../controllers/spree/admin/inventory_settings_controller.rb    | 2 +-
 core/app/controllers/spree/admin/inventory_units_controller.rb  | 2 +-
 core/app/controllers/spree/admin/line_items_controller.rb       | 2 +-
 core/app/controllers/spree/admin/mail_settings_controller.rb    | 2 +-
 core/app/controllers/spree/admin/overview_controller.rb         | 2 +-
 core/app/controllers/spree/admin/payments_controller.rb         | 2 +-
 core/app/controllers/spree/admin/reports_controller.rb          | 2 +-
 core/app/controllers/spree/admin/shipments_controller.rb        | 2 +-
 core/app/controllers/spree/admin/tax_settings_controller.rb     | 2 +-
 core/app/controllers/spree/admin/taxons_controller.rb           | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/app/controllers/spree/admin/image_settings_controller.rb b/core/app/controllers/spree/admin/image_settings_controller.rb
index d3303c1ff8a..d3af4747290 100644
--- a/core/app/controllers/spree/admin/image_settings_controller.rb
+++ b/core/app/controllers/spree/admin/image_settings_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class ImageSettingsController < BaseController
+    class ImageSettingsController < Spree::Admin::BaseController
       def show
         styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
         @styles_list = styles.collect { |k, v| k }.join(", ")
diff --git a/core/app/controllers/spree/admin/inventory_settings_controller.rb b/core/app/controllers/spree/admin/inventory_settings_controller.rb
index 57617f1e1aa..2517c9c5065 100644
--- a/core/app/controllers/spree/admin/inventory_settings_controller.rb
+++ b/core/app/controllers/spree/admin/inventory_settings_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class InventorySettingsController < BaseController
+    class InventorySettingsController < Spree::Admin::BaseController
 
       def update
         Spree::Config.set(params[:preferences])
diff --git a/core/app/controllers/spree/admin/inventory_units_controller.rb b/core/app/controllers/spree/admin/inventory_units_controller.rb
index b11a51538fc..61f231efbcc 100644
--- a/core/app/controllers/spree/admin/inventory_units_controller.rb
+++ b/core/app/controllers/spree/admin/inventory_units_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class InventoryUnitsController < BaseController
+    class InventoryUnitsController < Spree::Admin::BaseController
     end
   end
 end
\ No newline at end of file
diff --git a/core/app/controllers/spree/admin/line_items_controller.rb b/core/app/controllers/spree/admin/line_items_controller.rb
index 9a7a7caac29..3e6159df3bb 100644
--- a/core/app/controllers/spree/admin/line_items_controller.rb
+++ b/core/app/controllers/spree/admin/line_items_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class LineItemsController < BaseController
+    class LineItemsController < Spree::Admin::BaseController
 
       before_filter :load_order
       before_filter :load_line_item, :only => [:destroy, :update]
diff --git a/core/app/controllers/spree/admin/mail_settings_controller.rb b/core/app/controllers/spree/admin/mail_settings_controller.rb
index 328517bb626..db0220dd739 100644
--- a/core/app/controllers/spree/admin/mail_settings_controller.rb
+++ b/core/app/controllers/spree/admin/mail_settings_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class MailSettingsController < BaseController
+    class MailSettingsController < Spree::Admin::BaseController
 
       def update
         Spree::Config.set(params[:preferences])
diff --git a/core/app/controllers/spree/admin/overview_controller.rb b/core/app/controllers/spree/admin/overview_controller.rb
index 1c6dc287cb6..9d8ba571082 100644
--- a/core/app/controllers/spree/admin/overview_controller.rb
+++ b/core/app/controllers/spree/admin/overview_controller.rb
@@ -1,7 +1,7 @@
 # this clas was inspired (heavily) from the mephisto admin architecture
 module Spree
   module Admin
-    class OverviewController < BaseController
+    class OverviewController < Spree::Admin::BaseController
       #todo, add rss feed of information that is happening
 
       def index
diff --git a/core/app/controllers/spree/admin/payments_controller.rb b/core/app/controllers/spree/admin/payments_controller.rb
index 767fd9c0bec..da40d953a16 100644
--- a/core/app/controllers/spree/admin/payments_controller.rb
+++ b/core/app/controllers/spree/admin/payments_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class PaymentsController < BaseController
+    class PaymentsController < Spree::Admin::BaseController
       before_filter :load_order, :only => [:create, :new, :index, :fire]
       before_filter :load_payment, :except => [:create, :new, :index]
       before_filter :load_data
diff --git a/core/app/controllers/spree/admin/reports_controller.rb b/core/app/controllers/spree/admin/reports_controller.rb
index ac334d58a02..349cfa7cacf 100644
--- a/core/app/controllers/spree/admin/reports_controller.rb
+++ b/core/app/controllers/spree/admin/reports_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class ReportsController < BaseController
+    class ReportsController < Spree::Admin::BaseController
       before_filter :load_data
       respond_to :html
 
diff --git a/core/app/controllers/spree/admin/shipments_controller.rb b/core/app/controllers/spree/admin/shipments_controller.rb
index 7a865446b52..c57f9787198 100644
--- a/core/app/controllers/spree/admin/shipments_controller.rb
+++ b/core/app/controllers/spree/admin/shipments_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class ShipmentsController < BaseController
+    class ShipmentsController < Spree::Admin::BaseController
       before_filter :load_order
       before_filter :load_shipment, :only => [:destroy, :edit, :update, :fire]
       before_filter :load_shipping_methods, :except => [:country_changed, :index]
diff --git a/core/app/controllers/spree/admin/tax_settings_controller.rb b/core/app/controllers/spree/admin/tax_settings_controller.rb
index 5ad0cde8fd4..516fa6283ae 100644
--- a/core/app/controllers/spree/admin/tax_settings_controller.rb
+++ b/core/app/controllers/spree/admin/tax_settings_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class TaxSettingsController < BaseController
+    class TaxSettingsController < Spree::Admin::BaseController
 
       def update
         Spree::Config.set(params[:preferences])
diff --git a/core/app/controllers/spree/admin/taxons_controller.rb b/core/app/controllers/spree/admin/taxons_controller.rb
index f579c98ef0e..fbf732a708b 100644
--- a/core/app/controllers/spree/admin/taxons_controller.rb
+++ b/core/app/controllers/spree/admin/taxons_controller.rb
@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class TaxonsController < BaseController
+    class TaxonsController < Spree::Admin::BaseController
 
       respond_to :html, :json, :js