From 715aa9b5d6ba9eeb7d2a97d99fddb34daaf8c71a Mon Sep 17 00:00:00 2001 From: Hitoshi Nakashima Date: Wed, 5 May 2021 00:01:48 +0900 Subject: [PATCH] Better NG Words handling --- public/plugin/lokka-ng_words/lib/lokka/ng_words.rb | 8 ++++++-- public/plugin/lokka-ng_words/views/index.haml | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/public/plugin/lokka-ng_words/lib/lokka/ng_words.rb b/public/plugin/lokka-ng_words/lib/lokka/ng_words.rb index cb25385f5..b5c8ce08e 100644 --- a/public/plugin/lokka-ng_words/lib/lokka/ng_words.rb +++ b/public/plugin/lokka-ng_words/lib/lokka/ng_words.rb @@ -24,7 +24,7 @@ def self.registered(app) app.put '/admin/plugins/ng_words' do login_required - Option.ng_words = params[:ng_words][:ng_words] + Option.ng_words = ng_words_params if Option.ng_words flash[:notice] = t('ng_words.updated') redirect to('/admin/plugins/ng_words') @@ -46,7 +46,11 @@ def spam? end def ng_words - Option.ng_words + Option.ng_words&.split(',')&.map(&:strip) + end + + def ng_words_params + params[:ng_words].values.delete_if {|item| item.blank? }.join(', ') end end end diff --git a/public/plugin/lokka-ng_words/views/index.haml b/public/plugin/lokka-ng_words/views/index.haml index f3dc520dc..d74374644 100644 --- a/public/plugin/lokka-ng_words/views/index.haml +++ b/public/plugin/lokka-ng_words/views/index.haml @@ -5,7 +5,9 @@ .field %label{ for: :ng_words_key }= t('ng_words.ng_words') %br - %input{ type: :text, id: :ng_words, name: 'ng_words[ng_words]', value: @ng_words } + - @ng_words.each_with_index do |word, index| + %input{ type: :text, name: "ng_words[ng_words_#{index}]", value: word } + %input{ type: :text, name: "ng_words[ng_words_#{@ng_words.length}]", placeholder: I18n.t('new') } %br .field %p