avo 1.22.0.pre.1 → 1.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10a2613406476740ca5a3cff815bce94c985676c702f530a4c22d0b0607384f3
-  data.tar.gz: 06c2d049cbbff831857d26d6985b6f430955d70342c83e813b9599fbd510f619
+  metadata.gz: '04783e6660bd1ebada3544318b2f48082e3e43eb4bc7ee3df2986a9951d04090'
+  data.tar.gz: 6e997ae6e0dbb4eaa7828b669b73efd811370c0cfb5213d405f15bdd41bb9240
 SHA512:
-  metadata.gz: d7c1b1c2e51a5e0b6f5504090dda1b3853706204f107b5edc1fb76834b04b0c1da099fddeed4337a8ec92c5592f3774d22bb637f7bd1ff48db2bf8f9b86ff9b6
-  data.tar.gz: cb7873e95cd907c54d6d5cb2d91c7e4af733f200a28ccf4e70a52a04f3db294047bbd7a02bfd74623cbdaa06fcddcf8f4e4ec777ac9d7769e25ef153977dce71
+  metadata.gz: d61380b2f4c216d4ff1bd4e3e2f882500ba5e09835712d0661e8a79afd505f4b308ab7f30b41fcd95750e061003ca79a25b826e94eb9d007ba786923ce18740c
+  data.tar.gz: 383afdfdc9eaaa92e00b6b91895a1b14ebff2d1655e3c605e39838e6640e9ff9f74eebef1f0322d2eedd402b11060b2b02d4d933a7823edbd7343f47e3a5cd35

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.22.0.pre.1)
+    avo (1.22.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -215,7 +215,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
     msgpack (1.4.4)
     multi_xml (0.6.0)
@@ -227,10 +227,8 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
-      racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)

data/app/assets/stylesheets/avo.css

@@ -70,7 +70,7 @@ body {
 
 .application-sidebar .active:hover,
 .application-sidebar .active {
-  @apply bg-blue-100 text-blue-500;
+  @apply bg-gray-200;
 }
 
 .turbo-progress-bar {

data/app/assets/stylesheets/css/fonts.css

@@ -24,56 +24,3 @@
       url('/avo-assets/fonts/nunito-v16-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
       url('/avo-assets/fonts/nunito-v16-latin-700.svg#Nunito') format('svg'); /* Legacy iOS */
 }
-
-/* inter-regular - latin */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 400;
-  src: url('/avo-assets/fonts/inter-v7-latin-regular.eot'); /* IE9 Compat Modes */
-  src: local(''),
-       url('/avo-assets/fonts/inter-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/avo-assets/fonts/inter-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/avo-assets/fonts/inter-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
-       url('/avo-assets/fonts/inter-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/avo-assets/fonts/inter-v7-latin-regular.svg#Inter') format('svg'); /* Legacy iOS */
-}
-/* inter-500 - latin */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 500;
-  src: url('/avo-assets/fonts/inter-v7-latin-500.eot'); /* IE9 Compat Modes */
-  src: local(''),
-       url('/avo-assets/fonts/inter-v7-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/avo-assets/fonts/inter-v7-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/avo-assets/fonts/inter-v7-latin-500.woff') format('woff'), /* Modern Browsers */
-       url('/avo-assets/fonts/inter-v7-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/avo-assets/fonts/inter-v7-latin-500.svg#Inter') format('svg'); /* Legacy iOS */
-}
-/* inter-600 - latin */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 600;
-  src: url('/avo-assets/fonts/inter-v7-latin-600.eot'); /* IE9 Compat Modes */
-  src: local(''),
-       url('/avo-assets/fonts/inter-v7-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/avo-assets/fonts/inter-v7-latin-600.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/avo-assets/fonts/inter-v7-latin-600.woff') format('woff'), /* Modern Browsers */
-       url('/avo-assets/fonts/inter-v7-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/avo-assets/fonts/inter-v7-latin-600.svg#Inter') format('svg'); /* Legacy iOS */
-}
-/* inter-700 - latin */
-@font-face {
-  font-family: 'Inter';
-  font-style: normal;
-  font-weight: 700;
-  src: url('/avo-assets/fonts/inter-v7-latin-700.eot'); /* IE9 Compat Modes */
-  src: local(''),
-       url('/avo-assets/fonts/inter-v7-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('/avo-assets/fonts/inter-v7-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-       url('/avo-assets/fonts/inter-v7-latin-700.woff') format('woff'), /* Modern Browsers */
-       url('/avo-assets/fonts/inter-v7-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
-       url('/avo-assets/fonts/inter-v7-latin-700.svg#Inter') format('svg'); /* Legacy iOS */
-}

data/app/assets/stylesheets/css/pagination.css

@@ -21,18 +21,18 @@
 .pagy-nav-js .page a,
 .pagy-combo-nav-js .page a,
 .pagy-combo-nav-js .pagy-combo-input a {
-  @apply rounded-lg px-3 py-1 text-sm text-gray-500 font-semibold bg-white shadow-md;
+  @apply rounded-lg px-3 py-1 text-sm text-gray-500 font-semibold bg-gray-200 shadow-md;
 
   &:focus{
     @apply border-blue-300;
   }
 
   &:hover{
-    @apply bg-gray-200;
+    @apply bg-gray-300;
   }
 
   &:active{
-    @apply bg-gray-200;
+    @apply bg-gray-400 text-white;
   }
 }
 
@@ -42,26 +42,26 @@
 .pagy-nav .page.next.disabled,
 .pagy-nav-js .page.next.disabled,
 .pagy-combo-nav-js .page.next.disabled {
-  @apply text-gray-300 cursor-default;
+  @apply text-gray-400 cursor-default;
 
   &:hover {
-    @apply text-gray-300 bg-white;
+    @apply text-gray-400 bg-gray-200;
   }
 
   &:active {
-    @apply text-gray-300 bg-white;
+    @apply text-gray-400 bg-gray-200;
   }
 }
 
 .pagy-nav .page.active,
 .pagy-nav-js .page.active {
-  @apply text-white cursor-default bg-gray-500;
+  @apply text-white cursor-default bg-gray-400;
 
   &:hover {
-    @apply text-white bg-gray-500;
+    @apply text-white bg-gray-400;
   }
 
   &:active {
-    @apply bg-gray-500 text-white;
+    @apply bg-gray-400 text-white;
   }
 }

data/app/assets/stylesheets/css/search.css

@@ -1,14 +1,13 @@
 :root {
   --aa-primary-color: --tw-ring-color;
   --aa-selected-color: --tw-ring-color;
-  --aa-primary-color-rgb: 117, 125, 138;
+  --aa-primary-color-rgb: 5, 150, 105;
 }
 
 .global-search {
   .aa-DetachedSearchButton:focus,
   .aa-DetachedSearchButton {
     border: none !important;
-    @apply text-gray-500;
   }
 }
 
@@ -18,7 +17,7 @@
   }
 
   .aa-DetachedSearchButton {
-    @apply rounded border-gray-300 ;
+    @apply rounded-full border-gray-300;
   }
 }
 

data/app/components/avo/fields/belongs_to_field/autocomplete_component.rb

@@ -13,35 +13,35 @@ class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
   end
 
   def field_label
-    if searchable?
-      # New records won't have the value (instantiated model) present but the polymorphic_type and polymorphic_id prefilled
-      if new_record? && has_polymorphic_association?
-        @polymorphic_record.send(polymorphic_fields[:label])
-      else
-        @field.value&.class == @type ? @field.field_label : nil
-      end
-    else
-      @field.field_label
+    result = @field.field_label
+
+    # New records won't have the value (instantiated model) present but the polymorphic_type and polymorphic_id prefilled
+    if should_prefill?
+      result = @field.value&.class == @type ? @field.field_label : nil
     end
+
+    result
   end
 
   def field_value
-    if searchable?
-      # New records won't have the value (instantiated model) present but the polymorphic_type and polymorphic_id prefilled
-      if new_record? && has_polymorphic_association?
-        @polymorphic_record.send(polymorphic_fields[:id])
-      else
-        @field.value&.class == @type ? @field.field_value : nil
-      end
-    else
-      @field.field_value
+    result = @field.field_value
+
+    # New records won't have the value (instantiated model) present but the polymorphic_type and polymorphic_id prefilled
+    if should_prefill?
+      result = @field.value&.class == @type ? @field.field_value : nil
     end
+
+    result
   end
 
   private
 
+  def should_prefill?
+    @field.is_polymorphic? && searchable? && !(new_record? && has_polymorphic_association?)
+  end
+
   def searchable?
-    @type.present?
+    @field.searchable
   end
 
   def new_record?

data/app/components/avo/fields/belongs_to_field/edit_component.html.erb

@@ -13,7 +13,7 @@
     data-association-class="<%= @field&.target_resource&.model_class || nil %>"
   >
   <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-    <%= @form.select "#{@field.foreign_key}_type", @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
+    <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [type.to_s.underscore.humanize, type.to_s] },
       {
         value: @field.value,
         include_blank: @field.placeholder,
@@ -29,7 +29,7 @@
         # If the select field is disabled, no value will be sent. It's how HTML works.
         # Thus the extra hidden field to actually send the related id to the server.
         if disabled %>
-      <%= @form.hidden_field "#{@field.foreign_key}_type" %>
+      <%= @form.hidden_field @field.type_input_foreign_key %>
     <% end %>
   <% end %>
   <% @field.types.each do |type| %>
@@ -43,15 +43,16 @@
             field: @field,
             type: type,
             model_key: model_keys[type.to_s],
-            foreign_key: "#{@field.foreign_key}_id",
+            foreign_key: @field.id_input_foreign_key,
             resource: @resource,
             disabled: disabled,
             polymorphic_record: polymorphic_record
           %>
         <% else %>
-          <%= @form.select "#{@field.foreign_key}_id", options_for_select(@field.values_for_type(type), @resource.present? && @resource.model.present? ? @resource.model["#{@field.foreign_key}_id"] : nil),
+          <%= @form.select @field.id_input_foreign_key,
+            options_for_select(@field.values_for_type(type), @resource.present? && @resource.model.present? ? @resource.model[@field.id_input_foreign_key] : nil),
             {
-              value: @resource.model["#{@field.foreign_key}_id"].to_s,
+              value: @resource.model[@field.id_input_foreign_key].to_s,
               include_blank: @field.placeholder,
             },
             {
@@ -59,6 +60,12 @@
               disabled: disabled
             }
           %>
+          <%
+            # If the select field is disabled, no value will be sent. It's how HTML works.
+            # Thus the extra hidden field to actually send the related id to the server.
+            if disabled %>
+              <%= @form.hidden_field @field.id_input_foreign_key %>
+            <% end %>
         <% end %>
       <% end %>
     </div>
@@ -70,14 +77,15 @@
       <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
         field: @field,
         model_key: @field.target_resource&.model_key,
-        foreign_key: @field.foreign_key,
+        foreign_key: @field.id_input_foreign_key,
         resource: @resource,
         disabled: disabled
       %>
     <% else %>
-      <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
+      <%= @form.select @field.id_input_foreign_key, @field.options,
         {
           include_blank: @field.placeholder,
+          value: @field.value
         },
         {
           class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
@@ -88,7 +96,7 @@
         # If the select field is disabled, no value will be sent. It's how HTML works.
         # Thus the extra hidden field to actually send the related id to the server.
         if disabled %>
-        <%= @form.hidden_field @field.foreign_key %>
+        <%= @form.hidden_field @field.id_input_foreign_key %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/avo/fields/boolean_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, dash_if_blank: false, center_content: true do %>
+<%= index_field_wrapper field: @field, dash_if_blank: false do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

data/app/components/avo/fields/select_field/edit_component.html.erb

@@ -1,6 +1,6 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
   <%= @form.select @field.id, @field.options_for_select, { selected: @field.value, prompt: @field.placeholder }, {
-      class: helpers.input_classes(' w-full', has_error: @field.model_errors.include?(@field.id)),
-      disabled: @field.readonly,
-      value: @field.model.present? ? @field.model[@field.id] : @field.value } %>
+    class: helpers.input_classes(' w-full', has_error: @field.model_errors.include?(@field.id)),
+    disabled: @field.readonly,
+    value: @field.model.present? ? @field.model[@field.id] : @field.value } %>
 <% end %>

data/app/components/avo/index/field_wrapper_component.html.erb

@@ -1,13 +1,7 @@
-<td class="px-4 py-3 leading-tight whitespace-nowrap h-full text-slate-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
+<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-slate-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <% if @field.value.blank? && @dash_if_blank %>
     —
   <% else %>
-    <% if @center_content %>
-    <div class="flex items-center justify-center">
-      <%= content %>
-    </div>
-    <% else %>
-      <%= content %>
-    <% end %>
+    <%= content %>
   <% end %>
 </td>

data/app/components/avo/index/field_wrapper_component.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 class Avo::Index::FieldWrapperComponent < ViewComponent::Base
-  def initialize(field: nil, dash_if_blank: true, center_content: false, **args)
+  def initialize(field: nil, dash_if_blank: true, **args)
     @field = field
     @dash_if_blank = dash_if_blank
-    @center_content = center_content
     @classes = args[:class].present? ? args[:class] : ""
     @args = args
   end

data/app/components/avo/index/resource_table_component.html.erb

@@ -1,8 +1,8 @@
-<div class="w-full ">
+<div class="w-full">
   <% if @resources.present?%>
-    <table class="w-full px-4 overflow-hidden bg-white rounded shadow " data-resource-name='<%= @resource.model_key %>' data-controller='item-select-all'>
+    <table class="w-full px-4 overflow-hidden" data-resource-name='<%= @resource.model_key %>' data-controller='item-select-all'>
       <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(reflection: @reflection)} %>
-      <tbody class="divide-y">
+      <tbody>
         <% @resources.each_with_index do |resource, index| %>
           <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model) do %>
             <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model) %>

data/app/components/avo/index/table_row_component.html.erb

@@ -1,5 +1,5 @@
 <tr
-  class="bg-white hover:bg-sky-50 hover:shadow-row relative z-20 border-b"
+  class="hover:bg-sky-50 hover:shadow-row relative z-20 border-b"
   <%== item_selector_init @resource %>
 >
   <td class="w-10">

data/app/components/avo/navigation_heading_component.html.erb

@@ -1,3 +1,3 @@
-<div class="flex items-center p-4 text-gray-500 text-sm uppercase font-semibold leading-none">
-  <%= icon %> <%= label %>
+<div class="flex items-center my-2 p-3 text-gray-500 font-bold text-sm -mb-1 leading-none">
+  <div class="w-4"></div> <%= @label %>
 </div>

data/app/components/avo/navigation_heading_component.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::NavigationHeadingComponent < ViewComponent::Base
-  attr_reader :label
-  attr_reader :icon
-
-  def initialize(label: nil, icon: nil)
+  def initialize(label: nil)
     @label = label
-    @icon = icon
   end
 end

data/app/components/avo/navigation_link_component.html.erb

@@ -1,3 +1,3 @@
-<%= active_link_to @path, class: 'px-4 block mx-6 leading-none py-3 text-black rounded font-medium hover:bg-blue-50', active: @active do %>
-  <%= @label %>
+<%= active_link_to @path, class: 'text-gray-800 py-2 px-4 block font-normal hover:bg-gray-100 rounded-md mb-1 mx-3 text-sm leading-none', active: @active, target: @target do %>
+  <div class="w-4"></div> <%= @label %>
 <% end %>

data/app/components/avo/navigation_link_component.rb

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::NavigationLinkComponent < ViewComponent::Base
-  attr_reader :label
-  attr_reader :path
-  attr_reader :active
-  attr_reader :size
-
-  def initialize(label: nil, path: nil, active: :inclusive, size: :md)
+  def initialize(label: nil, path: nil, active: :inclusive, size: :md, target: "_self")
     @label = label
     @path = path
     @active = active
     @size = size
+    @target = target
   end
 end

data/app/components/avo/panel_component.html.erb

@@ -6,12 +6,10 @@
           <%= helpers.render_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
         </div>
       <% end %>
-
-      <div class="text-2xl tracking-normal font-semibold text-gray-800 truncate" data-target="title">
+      <div class="text-2xl tracking-normal font-bold text-gray-800 truncate" data-target="title">
         <%= @title %>
       </div>
-
-      <div class="text-base tracking-normal font-medium text-gray-600" data-target="description">
+      <div class="text-sm tracking-normal text-gray-600" data-target="description">
         <%== description %>
       </div>
     </div>
@@ -23,7 +21,7 @@
     </div>
   </div>
 
-  <div class="relative bg-white rounded-lg shadow mb-8 <%= @body_classes %>">
+  <div class="relative bg-white rounded-xl shadow-xl mb-8 <%= @body_classes %>">
     <%= body %>
   </div>
 

data/app/components/avo/views/resource_index_component.html.erb

@@ -1,12 +1,12 @@
 <div>
-  <%= render Avo::PanelComponent.new(title: title, description: description, body_classes: 'py-2', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
+  <%= render Avo::PanelComponent.new(title: title, description: description, body_classes: 'py-4', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
     <% c.tools do %>
       <% if can_see_the_actions_button? %>
         <%= render 'actions' %>
       <% end %>
 
       <% if can_see_the_create_button? %>
-        <%= a_link create_path, 'data-target': 'create', color: :primary, variant: :outlined do %>
+        <%= a_link create_path, 'data-target': 'create' do %>
           <%= svg 'plus' %> <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
         <% end %>
       <% end %>
@@ -19,7 +19,7 @@
     <% end %>
 
     <% c.body do %>
-      <div class="flex justify-between min-h-16"
+      <div class="flex justify-between pt-2 pb-2 min-h-16"
         data-selected-resources-name="<%= @resource.model_key %>"
         data-selected-resources="[]"
       >
@@ -27,14 +27,11 @@
           <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_key} if @resource.search_query.present? %>
         </div>
         <div class="flex justify-end items-center px-6 space-x-3">
-          <%= render 'filters' if @filters.present? %>
-
           <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>
+          <%= render 'filters' if @filters.present? %>
         </div>
       </div>
-    <% end %>
 
-    <% c.bare_content do %>
       <% if view_type.to_sym == :table %>
         <div class="w-full overflow-auto flex flex-col mt-4">
           <div class="relative flex-1 flex">
@@ -48,11 +45,13 @@
           <% end %>
         </div>
       <% end %>
+    <% end %>
 
+    <% c.bare_content do %>
       <% if view_type.to_sym == :grid %>
         <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
 
-        <div class="mt-8 py-6">
+        <div class="bg-white rounded-xl shadow-xl mt-8 py-6">
           <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame || 'none' } %>
         </div>
       <% end %>

data/app/components/avo/views/resource_show_component.html.erb

@@ -24,16 +24,6 @@
               <%= svg 'arrow-left' %> <%= t('avo.go_back') %>
             <% end %>
 
-            <%# -- %>
-
-            <%#= render Avo::ButtonComponent.new(icon: svg('arrow-left'), is_link: true, href: back_path) do %>
-              <%#= t('avo.go_back') %>
-            <%# end %>
-
-            <%#= render Avo::ButtonComponent.new(color: 'green', spinner: true, type: :submit, icon: svg('save')) do %>
-              <%#= t('avo.save').capitalize %>
-            <%# end %>
-
             <% if can_see_the_destroy_button? %>
               <%= form_with url: helpers.resource_path(model: @resource.model, resource: @resource), method: :delete, html: { 'data-turbo-frame': params[:turbo_frame] } do |form| %>
                 <%= a_button title: t('avo.delete_item', item: @resource.model.model_name.name.downcase).capitalize,

data/app/controllers/avo/application_controller.rb

@@ -1,6 +1,11 @@
 module Avo
   class ApplicationController < ::ActionController::Base
-    include Pundit::Authorization
+    if defined?(Pundit::Authorization)
+      include Pundit::Authorization
+    else
+      include Pundit
+    end
+
     include Pagy::Backend
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
@@ -111,7 +116,12 @@ module Avo
     end
 
     def fill_model
-      @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+      # We have to skip filling the the model if this is an attach action
+      is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
+
+      unless is_attach_action
+        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+      end
     end
 
     def hydrate_resource
@@ -187,18 +197,6 @@ module Avo
       query
     end
 
-    # def authorize_user
-    #   return if params[:controller] == 'avo/search'
-
-    #   model = record = resource.model
-
-    #   if ['show', 'edit', 'update'].include?(params[:action]) && params[:controller] == 'avo/resources'
-    #     record = resource
-    #   end
-
-    #   # AuthorizationService::authorize_action _current_user, record, params[:action] return render_unauthorized unless
-    # end
-
     def _authenticate!
       instance_eval(&Avo.configuration.authenticate)
     end
@@ -243,5 +241,9 @@ module Avo
     def on_api_path
       request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
+
+    def model_param_key
+      @resource.form_scope
+    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -7,6 +7,7 @@ module Avo
     before_action :hydrate_resource
     before_action :set_model, only: [:show, :edit, :destroy, :update]
     before_action :set_model_to_fill
+    before_action :fill_model, only: [:create, :update]
     before_action :authorize_action
     before_action :reset_pagination_if_filters_changed, only: :index
     before_action :cache_applied_filters, only: :index
@@ -83,6 +84,7 @@ module Avo
     def new
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
+      # abort @model.course.inspect
 
       @page_title = @resource.default_panel_name
       add_breadcrumb resource_name.humanize, resources_path(resource: @resource)
@@ -112,7 +114,6 @@ module Avo
 
     def create
       # model gets instantiated and filled in the fill_model method
-      fill_model
       saved = @model.save
       @resource.hydrate(model: @model, view: :new, user: _current_user)
 
@@ -166,7 +167,6 @@ module Avo
 
     def update
       # model gets instantiated and filled in the fill_model method
-      fill_model
       saved = @model.save
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
@@ -194,8 +194,6 @@ module Avo
     private
 
     def model_params
-      model_param_key = @resource.form_scope
-
       request_params = params.require(model_param_key).permit(permitted_params)
 
       if @resource.devise_password_optional && request_params[:password].blank? && request_params[:password_confirmation].blank?

data/app/controllers/avo/relations_controller.rb

@@ -37,10 +37,7 @@ module Avo
       query = @authorization.apply_policy @attachment_class
 
       @options = query.all.map do |model|
-        {
-          value: model.id,
-          label: model.send(@attachment_resource.class.title)
-        }
+        [model.send(@attachment_resource.class.title), model.id]
       end
     end