Fix: NGワード設定画面のエラー
This commit is contained in:
parent
f533e8cd22
commit
e975a98b9f
4 changed files with 15 additions and 15 deletions
|
@ -21,6 +21,10 @@ module Admin
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def avoid_save?
|
||||||
|
true
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def after_update_redirect_path
|
def after_update_redirect_path
|
||||||
|
|
|
@ -13,6 +13,12 @@ module Admin
|
||||||
|
|
||||||
return unless validate
|
return unless validate
|
||||||
|
|
||||||
|
if avoid_save?
|
||||||
|
flash[:notice] = I18n.t('generic.changes_saved_msg')
|
||||||
|
redirect_to after_update_redirect_path
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
@admin_settings = Form::AdminSettings.new(settings_params)
|
@admin_settings = Form::AdminSettings.new(settings_params)
|
||||||
|
|
||||||
if @admin_settings.save
|
if @admin_settings.save
|
||||||
|
@ -33,6 +39,10 @@ module Admin
|
||||||
admin_ng_words_path
|
admin_ng_words_path
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def avoid_save?
|
||||||
|
false
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def settings_params
|
def settings_params
|
||||||
|
@ -40,7 +50,7 @@ module Admin
|
||||||
end
|
end
|
||||||
|
|
||||||
def settings_params_test
|
def settings_params_test
|
||||||
params.require(:form_admin_settings)[:ng_words_test]
|
params.expect(form_admin_settings: [ng_words_test: [keywords: [], strangers: [], temporary_ids: []]])['ng_words_test']
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,16 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class SystemCssController < ActionController::Base # rubocop:disable Rails/ApplicationController
|
class SystemCssController < ActionController::Base # rubocop:disable Rails/ApplicationController
|
||||||
before_action :set_user_roles
|
|
||||||
|
|
||||||
def show
|
def show
|
||||||
expires_in 3.minutes, public: true
|
expires_in 3.minutes, public: true
|
||||||
render content_type: 'text/css'
|
render content_type: 'text/css'
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def set_user_roles
|
|
||||||
@user_roles = UserRole.providing_styles
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
<%- @user_roles.each do |role| %>
|
|
||||||
.user-role-<%= role.id %> {
|
|
||||||
--user-role-accent: <%= role.color %>;
|
|
||||||
}
|
|
||||||
|
|
||||||
<%- end %>
|
|
Loading…
Add table
Add a link
Reference in a new issue