about summary refs log tree commit diff
path: root/app/views/settings
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-02-03 03:59:51 +0100
committerGitHub <noreply@github.com>2019-02-03 03:59:51 +0100
commitd14c276e58f0f223b0e4889d342a948c961081b2 (patch)
treef25b687f755725ee58b80ab2281dc368f5dc42eb /app/views/settings
parentc5071f2d787e81251c2b3111074b20d94773ee44 (diff)
Add option to overwrite imported data (#9962)
* Add option to overwrite imported data

Fix #7465

* Add import for domain blocks
Diffstat (limited to 'app/views/settings')
-rw-r--r--app/views/settings/imports/show.html.haml7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/settings/imports/show.html.haml b/app/views/settings/imports/show.html.haml
index 4512fc714..7bb4beb01 100644
--- a/app/views/settings/imports/show.html.haml
+++ b/app/views/settings/imports/show.html.haml
@@ -5,8 +5,11 @@
   .field-group
     = f.input :type, collection: Import.types.keys, wrapper: :with_block_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") }, hint: t('imports.preface')
 
-  .field-group
-    = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data')
+  .fields-row
+    .fields-group.fields-row__column.fields-row__column-6
+      = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data')
+    .fields-group.fields-row__column.fields-row__column-6
+      = f.input :mode, as: :radio_buttons, collection: Import::MODES, label_method: lambda { |mode| safe_join([I18n.t("imports.modes.#{mode}"), content_tag(:span, I18n.t("imports.modes.#{mode}_long"), class: 'hint')]) }, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
 
   .actions
     = f.button :button, t('imports.upload'), type: :submit