Fix multiple custom field groups on new entity creation

fatfreecrm · Aug 20, 2024 · 9ab7032 · 9ab7032
1 parent 7dc8dfa
commit 9ab7032
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/controllers/entities_controller.rb b/app/controllers/entities_controller.rb
@@ -83,7 +83,7 @@ def versions
   #----------------------------------------------------------------------------
   def field_group
     if @tag = Tag.find_by_name(params[:tag].strip)
-      if @field_group = FieldGroup.find_by_tag_id_and_klass_name(@tag.id, klass.to_s)
+      if @field_groups = FieldGroup.where(tag_id: @tag.id, klass_name: klass.to_s)
         @asset = klass.find_by_id(params[:asset_id]) || klass.new
         render('fields/group') && return
       end

diff --git a/app/views/fields/group.js.erb b/app/views/fields/group.js.erb
@@ -1,3 +1,5 @@
 <%= simple_fields_for(@asset) do |f| %>
-  $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: @field_group, fields: @field_group.fields}) %>')
+  <% @field_groups.each do |field_group| %>
+    $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: field_group, fields: field_group.fields}) %>')
+  <% end %>
 <% end %>