Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Auth take two:: Fixes /admin/configuration not loading correctly in admin area & /admin/general_settings not finding navigation helper #1624

Closed
wants to merge 2 commits into from

2 participants

@beneggett

Per my comment here #1512 (comment)

@radar
Collaborator

Reminder to future sober self: go through and revise other controllers in admin namespace for this defect.

@beneggett

I'll grab em and add it to the pot, no worries

@beneggett beneggett Namespaced all other admin controllers that inheristed from < BaseCon…
…troller to explicitly inherit from Spree::Admin::BaseController
3c62e8e
@radar
Collaborator

Excellent, thanks Ben.

I've merged this change into 1-1-stable, master and auth-take-two.

@radar radar closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 2, 2012
  1. @beneggett

    Adjusted admin/config & admin/general_settings controllers class to e…

    beneggett authored
    …xplicitly inherit from Spree::Admin::BaseController
  2. @beneggett

    Namespaced all other admin controllers that inheristed from < BaseCon…

    beneggett authored
    …troller to explicitly inherit from Spree::Admin::BaseController
This page is out of date. Refresh to see the latest.
View
2  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
View
2  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']
View
2  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(", ")
View
2  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])
View
2  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
View
2  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]
View
2  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])
View
2  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
View
2  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
View
2  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
View
2  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]
View
2  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])
View
2  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
Something went wrong with that request. Please try again.