Fix to show validation errors in modals

Fixes #1735
railsadminteam · Oct 2, 2021 · f67defb · f67defb
1 parent ac3fe35
commit f67defb
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 7 deletions.
diff --git a/app/assets/javascripts/rails_admin/ra.remote-form.js b/app/assets/javascripts/rails_admin/ra.remote-form.js
@@ -88,10 +88,7 @@
 
       form.bind("ajax:complete", function(event) {
         var data = event.detail[0], status = event.detail[1];
-        if (status == 'error') {
-          dialog.find('.modal-body').html(data.responseText);
-          widget._bindFormEvents();
-        } else {
+        if (status == 'OK') {
           var json = $.parseJSON(data.responseText);
           var option = '<option value="' + json.id + '" selected>' + json.label + '</option>';
           var select = widget.element.find('select').filter(":hidden");
@@ -116,6 +113,9 @@
           }
           widget._trigger("success");
           dialog.modal("hide");
+        } else {
+          dialog.find('.modal-body').html(data.responseText);
+          widget._bindFormEvents();
         }
       });
     },

diff --git a/app/controllers/rails_admin/main_controller.rb b/app/controllers/rails_admin/main_controller.rb
@@ -110,7 +110,7 @@ def handle_save_error(whereto = :new)
 
       respond_to do |format|
         format.html { render whereto, status: :not_acceptable }
-        format.js   { render whereto, layout: false, status: :not_acceptable }
+        format.js   { render whereto, layout: 'rails_admin/modal', status: :not_acceptable, content_type: Mime[:html].to_s }
       end
     end
 

diff --git a/app/views/layouts/rails_admin/modal.js.haml b/app/views/layouts/rails_admin/modal.js.haml
@@ -0,0 +1,5 @@
+- flash && flash.each do |key, value|
+  .alert.alert-dismissible{class: flash_alert_class(key)}
+    %button.close{type: 'button', :'data-dismiss' => "alert"} &times;
+    = value
+= yield
diff --git a/lib/rails_admin/config/actions/edit.rb b/lib/rails_admin/config/actions/edit.rb
@@ -18,7 +18,7 @@ class Edit < RailsAdmin::Config::Actions::Base
 
               respond_to do |format|
                 format.html { render @action.template_name }
-                format.js   { render @action.template_name, layout: false }
+                format.js   { render @action.template_name, layout: 'rails_admin/modal', content_type: Mime[:html].to_s }
               end
 
             elsif request.put? # UPDATE

diff --git a/lib/rails_admin/config/actions/new.rb b/lib/rails_admin/config/actions/new.rb
@@ -26,7 +26,7 @@ class New < RailsAdmin::Config::Actions::Base
               end
               respond_to do |format|
                 format.html { render @action.template_name }
-                format.js   { render @action.template_name, layout: false }
+                format.js   { render @action.template_name, layout: 'rails_admin/modal', content_type: Mime[:html].to_s }
               end
 
             elsif request.post? # CREATE

diff --git a/spec/integration/widgets/remote_form_spec.rb b/spec/integration/widgets/remote_form_spec.rb
@@ -105,4 +105,46 @@
       expect(FieldTest.first.carrierwave_asset.file.size).to eq 1575
     end
   end
+
+  context 'with validation errors' do
+    before do
+      RailsAdmin.config Team do
+        field :players
+      end
+      RailsAdmin.config Player do
+        field :name
+        field :number
+        field :team
+      end
+    end
+
+    context 'on create' do
+      it 'shows the error messages' do
+        visit new_path(model_name: 'team')
+        click_link 'Add a new Player'
+        is_expected.to have_content 'New Player'
+        find('#player_name').set('on steroids')
+        find('#modal .save-action').click
+        is_expected.to have_css('#modal')
+        is_expected.to have_content 'Player is cheating'
+        is_expected.to have_css '.text-danger', text: 'is not a number'
+      end
+    end
+
+    context 'on update' do
+      let!(:player) { FactoryBot.create :player, name: 'Cheater' }
+
+      it 'shows the error messages' do
+        visit new_path(model_name: 'team')
+        find('option', text: 'Cheater').double_click
+        is_expected.to have_content "Edit Player 'Cheater'"
+        find('#player_name').set('Cheater on steroids')
+        find('#player_number').set('')
+        find('#modal .save-action').click
+        is_expected.to have_css('#modal')
+        is_expected.to have_content 'Player is cheating'
+        is_expected.to have_css '.text-danger', text: 'is not a number'
+      end
+    end
+  end
 end