Merge 7e5a4af into 7a268da

railsadminteam · Mar 18, 2020 · 55a0642 · 55a0642
2 parents 7a268da + 7e5a4af
commit 55a0642
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/rails_admin/ra.widgets.js b/app/assets/javascripts/rails_admin/ra.widgets.js
@@ -202,7 +202,7 @@
         urls = type_select.data('urls');
         type_select.on('change', function(e) {
           var selected_data, selected_type;
-          selected_type = type_select.val().toLowerCase();
+          selected_type = type_select.val().toLowerCase().replace("::", "-");
           selected_data = $("#" + selected_type + "-js-options").data('options');
           object_select.data('options', selected_data);
           object_select.filteringSelect("destroy");

diff --git a/app/views/rails_admin/main/_form_polymorphic_association.html.haml b/app/views/rails_admin/main/_form_polymorphic_association.html.haml
@@ -12,7 +12,7 @@
   js_data = type_collection.inject({}) do |options, model|
     model_name = model.second.underscore.downcase
     source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
-    options.merge(model_name.gsub("_", "") => {
+    options.merge(model_name.gsub("_", "").gsub("/", "-") => {
       xhr: true,
       remote_source: index_path(model_name, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, current_action: current_action, compact: true),
       float_left: false