diff options
| author | Reverite <github@reverite.sh> | 2019-09-30 16:38:09 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-30 16:38:09 -0700 |
| commit | 01001ba118d7adcd4966c893cf95db32fe76c273 (patch) | |
| tree | fc8b580c8f0a3c1e14a8ca20e3bea5bd7acb4ff1 /app/controllers/admin | |
| parent | 1e75b3d874973dd71ea74b158ebeb501d9ac68a3 (diff) | |
| parent | 65db9df011a3e13efa79f4e56343aa69bdad7716 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/relays_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/admin/two_factor_authentications_controller.rb | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/admin/relays_controller.rb b/app/controllers/admin/relays_controller.rb index 1b02d3c36..6fbb6e063 100644 --- a/app/controllers/admin/relays_controller.rb +++ b/app/controllers/admin/relays_controller.rb @@ -3,6 +3,7 @@ module Admin class RelaysController < BaseController before_action :set_relay, except: [:index, :new, :create] + before_action :require_signatures_enabled!, only: [:new, :create, :enable] def index authorize :relay, :update? @@ -11,7 +12,7 @@ module Admin def new authorize :relay, :update? - @relay = Relay.new(inbox_url: Relay::PRESET_RELAY) + @relay = Relay.new end def create @@ -54,5 +55,9 @@ module Admin def resource_params params.require(:relay).permit(:inbox_url) end + + def require_signatures_enabled! + redirect_to admin_relays_path, alert: I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode? + end end end diff --git a/app/controllers/admin/two_factor_authentications_controller.rb b/app/controllers/admin/two_factor_authentications_controller.rb index 2577a4b17..0652c3a7a 100644 --- a/app/controllers/admin/two_factor_authentications_controller.rb +++ b/app/controllers/admin/two_factor_authentications_controller.rb @@ -8,6 +8,7 @@ module Admin authorize @user, :disable_2fa? @user.disable_two_factor! log_action :disable_2fa, @user + UserMailer.two_factor_disabled(@user).deliver_later! redirect_to admin_accounts_path end |