Merge pull request #143 from nanjakkun/fix_flash_messsages

Fix flash messsages
stephskardal · Jun 4, 2024 · 54555df · 54555df
2 parents 0c22450 + 91a8d53
commit 54555df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,6 +24,7 @@ group :test do
   gem 'rspec', '~> 3.10'
   gem 'rspec-rails', '~> 5.0'
   gem 'factory_bot_rails', '~> 6.2'
+  gem 'factory_bot', '< 6.4'
   gem 'database_cleaner-active_record', require: false
   gem 'database_cleaner-mongoid', require: false
 end

diff --git a/app/views/rails_admin/main/import.html.erb b/app/views/rails_admin/main/import.html.erb
@@ -11,7 +11,7 @@
 %>
 
 <%= render "results" %>
-<%= form_tag import_path(@abstract_model), :multipart => true, class: 'form-horizontal denser' do %>
+<%= form_tag import_path(@abstract_model), :multipart => true, class: 'form-horizontal denser', data: { turbo: false } do %>
   <input name="send_data" type="hidden" value="true">/</input>
   <fieldset>
     <legend>
@@ -53,7 +53,7 @@
         <%= t("admin.import.update_if_exists") %>
       </label>
       <div class="col-sm-10 controls">
-        <%= check_box_tag :update_if_exists, '1', RailsAdminImport.config.update_if_exists, :class => "form-control" %>
+        <%= check_box_tag :update_if_exists, '1', RailsAdminImport.config.update_if_exists %>
         <p class="help-block">
           <%= t('admin.import.help.update_if_exists') %>
         </p>