mirror of
https://github.com/codeninjasllc/discourse.git
synced 2025-02-17 04:01:29 -05:00
FIX: You should be an admin to do the wizard
This commit is contained in:
parent
8f7a2cb470
commit
7f66cf618c
5 changed files with 8 additions and 4 deletions
|
@ -461,6 +461,10 @@ class ApplicationController < ActionController::Base
|
||||||
raise Discourse::InvalidAccess.new unless current_user && current_user.staff?
|
raise Discourse::InvalidAccess.new unless current_user && current_user.staff?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def ensure_admin
|
||||||
|
raise Discourse::InvalidAccess.new unless current_user && current_user.admin?
|
||||||
|
end
|
||||||
|
|
||||||
def ensure_wizard_enabled
|
def ensure_wizard_enabled
|
||||||
raise Discourse::InvalidAccess.new unless SiteSetting.wizard_enabled?
|
raise Discourse::InvalidAccess.new unless SiteSetting.wizard_enabled?
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,7 +6,7 @@ class StepsController < ApplicationController
|
||||||
|
|
||||||
before_filter :ensure_wizard_enabled
|
before_filter :ensure_wizard_enabled
|
||||||
before_filter :ensure_logged_in
|
before_filter :ensure_logged_in
|
||||||
before_filter :ensure_staff
|
before_filter :ensure_admin
|
||||||
|
|
||||||
def update
|
def update
|
||||||
wizard = Wizard::Builder.new(current_user).build
|
wizard = Wizard::Builder.new(current_user).build
|
||||||
|
|
|
@ -4,7 +4,7 @@ require_dependency 'wizard/builder'
|
||||||
class WizardController < ApplicationController
|
class WizardController < ApplicationController
|
||||||
before_filter :ensure_wizard_enabled, only: [:index]
|
before_filter :ensure_wizard_enabled, only: [:index]
|
||||||
before_filter :ensure_logged_in
|
before_filter :ensure_logged_in
|
||||||
before_filter :ensure_staff
|
before_filter :ensure_admin
|
||||||
|
|
||||||
skip_before_filter :check_xhr, :preload_json
|
skip_before_filter :check_xhr, :preload_json
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ describe StepsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
it "raises an error if you aren't an admin" do
|
it "raises an error if you aren't an admin" do
|
||||||
log_in
|
log_in(:moderator)
|
||||||
xhr :put, :update, id: 'made-up-id', fields: { forum_title: "updated title" }
|
xhr :put, :update, id: 'made-up-id', fields: { forum_title: "updated title" }
|
||||||
expect(response).to be_forbidden
|
expect(response).to be_forbidden
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,7 +14,7 @@ describe WizardController do
|
||||||
end
|
end
|
||||||
|
|
||||||
it "raises an error if you aren't an admin" do
|
it "raises an error if you aren't an admin" do
|
||||||
log_in
|
log_in(:moderator)
|
||||||
xhr :get, :index
|
xhr :get, :index
|
||||||
expect(response).to be_forbidden
|
expect(response).to be_forbidden
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue