* Change: #591 ホワイトリストのドメイン一覧の保存先・画面変更 * Update account_batch.rb * 表示まわりを改善 * Update dangerous.rake
This commit is contained in:
parent
8c399cefce
commit
ff2860d0df
18 changed files with 211 additions and 49 deletions
|
@ -0,0 +1,6 @@
|
|||
- temporary_id = defined?(@temp_id) ? @temp_id += 1 : @temp_id = 1
|
||||
%tr{ class: template ? 'template-row' : nil }
|
||||
%td= f.input :domains, as: :string, input_html: { multiple: true, value: specified_domain.domain }
|
||||
%td
|
||||
= hidden_field_tag :'form_admin_settings[specified_domains][temporary_ids][]', temporary_id, class: 'temporary_id'
|
||||
= link_to safe_join([fa_icon('times'), t('filters.index.delete')]), '#', class: 'table-action-link delete-row-button'
|
|
@ -18,8 +18,24 @@
|
|||
.fields-group
|
||||
= f.input :hold_remote_new_accounts, wrapper: :with_label, as: :boolean, label: t('admin.ng_words.hold_remote_new_accounts'), hint: t('admin.ng_words.remote_approval_hint')
|
||||
|
||||
.fields-group
|
||||
= f.input :permit_new_account_domains, wrapper: :with_label, as: :text, kmyblue: true, input_html: { rows: 6 }, label: t('admin.ng_words.permit_new_account_domains')
|
||||
%h4= t('admin.ng_words.white_list_header')
|
||||
|
||||
.table-wrapper
|
||||
%table.table.keywords-table#white-list-table
|
||||
%thead
|
||||
%tr
|
||||
%th= t('simple_form.labels.defaults.domain')
|
||||
%th
|
||||
%tbody
|
||||
= f.simple_fields_for :specified_domains, @white_list_domains do |domain|
|
||||
= render partial: 'specified_domain', collection: @white_list_domains, locals: { f: domain, template: false }
|
||||
|
||||
= f.simple_fields_for :specified_domains, @white_list_domains do |domain|
|
||||
= render partial: 'specified_domain', collection: [SpecifiedDomain.new], locals: { f: domain, template: true }
|
||||
%tfoot
|
||||
%tr
|
||||
%td{ colspan: 2 }
|
||||
= link_to safe_join([fa_icon('plus'), t('admin.ng_words.edit.add_domain')]), '#', class: 'table-action-link add-row-button'
|
||||
|
||||
.actions
|
||||
= f.button :button, t('generic.save_changes'), type: :submit
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue