diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-27 02:13:34 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:19:07 -0600 |
| commit | 8a7020dde819bbabee6bd55dc8a0d3b8b51e258b (patch) | |
| tree | 49637924ee3ba4bcd540d92aa189889d879d0b7a /app/controllers/admin | |
| parent | 4692c6033fe23c375651e55837550cfb33e49895 (diff) | |
port tootsuite#11963 to monsterfork: Fix relays UI being available in whitelist/secure mode
Fix relays UI referencing relay that is not functional
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/relays_controller.rb | 7 |
1 files changed, 6 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 |