Merge pull request #2737 from tmesquita/nested-attributes-form-fix

fixes 'Cannot set property '_renderItem' of undefined' when adding a nested resource
railsadminteam · Oct 29, 2016 · 326ee71 · 326ee71
2 parents b92a4d1 + ca0510e
commit 326ee71
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/app/assets/javascripts/rails_admin/ra.filtering-select.js b/app/assets/javascripts/rails_admin/ra.filtering-select.js
@@ -33,22 +33,21 @@
     select: null,
 
     _create: function() {
-      var filtering_select;
+      var filtering_select = this.element.siblings(
+        '[data-input-for="' + this.element.attr('id') + '"]'
+      );
 
       // When using the browser back and forward buttons, it is possible that
       // the autocomplete field will be cached which causes duplicate fields
       // to be generated.
-      if (this.element.is(':visible')) {
+      if (filtering_select.size() > 0) {
+        this.input = filtering_select.children('input');
+        this.button = filtering_select.children('.input-group-btn');
+      } else {
         this.element.hide();
         filtering_select = this._inputGroup(this.element.attr('id'));
         this.input = this._inputField();
         this.button = this._buttonField();
-      } else {
-        filtering_select = this.element.siblings(
-          '[data-input-for="' + this.element.attr('id') + '"]'
-        );
-        this.input = filtering_select.children('input');
-        this.button = filtering_select.children('.input-group-btn');
       }
 
       this._setOptionsSource();

diff --git a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
@@ -75,9 +75,11 @@
 
     it 'shows associated objects' do
       is_expected.to have_selector '#fan_team_ids' do |select|
-        expect(select[0]).to have_selector 'option[selected="selected"]'
-        expect(select[1]).not_to have_selector 'option[selected="selected"]'
-        expect(select[2]).not_to have_selector 'option[selected="selected"]'
+        options = select.all 'option'
+
+        expect(options[0]['selected']).to eq 'selected'
+        expect(options[1]['selected']).to eq nil
+        expect(options[2]['selected']).to eq nil
       end
     end
   end

diff --git a/spec/integration/config/edit/rails_admin_config_edit_spec.rb b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
@@ -725,6 +725,15 @@ class HelpTest < Tableless
       expect(@record.nested_field_tests[0].title).to eq('nested field test title 1 edited')
     end
 
+    it 'works with nested has_many', js: true do
+      @record = FactoryGirl.create :field_test
+      visit edit_path(model_name: 'field_test', id: @record.id)
+
+      find('#field_test_nested_field_tests_attributes_field .add_nested_fields').click
+
+      expect(page).to have_selector('.fields.tab-pane.active', visible: true)
+    end
+
     it 'is optional for has_one' do
       @record = FactoryGirl.create :field_test
       visit edit_path(model_name: 'field_test', id: @record.id)