avo 2.5.2.pre.3 → 2.5.2.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7963cde66a3c52ebd99d73a2b14cc49a8c01903e3c7250591d056002fcfc6925
-  data.tar.gz: 630dc0c27f4375f99d74d246ce7196b1f8c4ae5b2039b122dbbc57fd50475e85
+  metadata.gz: 22511d72c9065fbb776ed546dd2522554cdface044c11d6418b81807a32793f5
+  data.tar.gz: 4bd69e6ec75df792913f43dcd2e39d892cf5299e596647e78545cc7bf49fac03
 SHA512:
-  metadata.gz: f6f92981960f52d4c79b5969e674698aedc5d0d8426b1b2071a3b185e66e1aa29de3f342131674238d1bda00ce3aa5db54a04e04d3b78cea79b40753b1f7a236
-  data.tar.gz: 96b8f246246896b659e21a0fa5c4aa70a547bc9137d387c7c2e1b04aba41038cf28559a576715b3c6cd53c36c7c16ec7f701bb509fea8985615f98548499d00e
+  metadata.gz: 1d16808f6a6a533e1fd4b942fb303a8c5af1286a245bd532e1a71bcf2f9302f548c49bc9e50821e4cfc1b1cb92388e3d92f0dc7dba3cfb38c2b957aab3e0f984
+  data.tar.gz: c063076faed31f2d712a7c44e76db798ac99e7f37ae18fb4132217ac7980d6da8b79ecaae2b4ea5d526e1cccd0b4688694c4010375c549ad6850bcc039d3088b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.5.2.pre.3)
+    avo (2.5.2.pre.4)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -248,8 +248,6 @@ GEM
     nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport

data/app/assets/builds/avo.css

@@ -7553,14 +7553,6 @@ progress[value]::-moz-progress-bar{
   line-height:1rem
 }
 
-.text-\[15px\]{
-  font-size:15px
-}
-
-.text-\[14px\]{
-  font-size:14px
-}
-
 .font-semibold{
   font-weight:600
 }

data/app/controllers/avo/associations_controller.rb

@@ -46,8 +46,8 @@ module Avo
         query = @authorization.apply_policy @attachment_class
 
         # Add the association scope to the query scope
-        if @field.scope.present?
-          query = Avo::Hosts::AssociationScopeHost.new(block: @field.scope, query: query, parent: @model).handle
+        if @field.attach_scope.present?
+          query = Avo::Hosts::AssociationScopeHost.new(block: @field.attach_scope, query: query, parent: @model).handle
         end
 
         @options = query.all.map do |model|

data/app/controllers/avo/search_controller.rb

@@ -51,12 +51,12 @@ module Avo
         # Fetch the field
         field = belongs_to_field
 
-        if field.scope.present?
+        if field.attach_scope.present?
           # Fetch the parent
           parent = params[:via_reflection_class].safe_constantize.find params[:via_reflection_id]
 
           # Add to the query
-          query = Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.scope, query: query, parent: parent).handle
+          query = Avo::Hosts::AssociationScopeHost.new(block: belongs_to_field.attach_scope, query: query, parent: parent).handle
         end
       end
 

data/app/views/layouts/avo/application.html.erb

@@ -50,5 +50,8 @@
     <% end %>
     <%= render partial: "avo/partials/scripts" %>
     <!-- Avo version: <%= Avo::VERSION %> -->
+    <!-- Environment: <%= Rails.env %> -->
+    <!-- License ID: <%= Avo::App.license.id %> -->
+    <!-- License valid?: <%= Avo::App.license.valid ? "valid" : "invalid" %>  -->
   </body>
 </html>

data/lib/avo/fields/belongs_to_field.rb

@@ -62,7 +62,7 @@ module Avo
       attr_reader :relation_method
       attr_reader :types # for Polymorphic associations
       attr_reader :allow_via_detaching
-      attr_reader :scope
+      attr_reader :attach_scope
       attr_reader :polymorphic_help
 
       def initialize(id, **args, &block)
@@ -75,7 +75,7 @@ module Avo
         @types = args[:types]
         @relation_method = id.to_s.parameterize.underscore
         @allow_via_detaching = args[:allow_via_detaching] == true
-        @scope = args[:scope]
+        @attach_scope = args[:attach_scope]
         @polymorphic_help = args[:polymorphic_help]
       end
 
@@ -117,8 +117,8 @@ module Avo
 
         query = Avo::Services::AuthorizationService.apply_policy(user, resource.class.query_scope)
 
-        if scope.present?
-          query = Avo::Hosts::AssociationScopeHost.new(block: scope, query: query, parent: get_model).handle
+        if attach_scope.present?
+          query = Avo::Hosts::AssociationScopeHost.new(block: attach_scope, query: query, parent: get_model).handle
         end
 
         query.all.map do |model|

data/lib/avo/fields/has_base_field.rb

@@ -3,12 +3,14 @@ module Avo
     class HasBaseField < BaseField
       attr_accessor :display
       attr_accessor :scope
+      attr_accessor :attach_scope
       attr_accessor :description
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
         @scope = args[:scope].present? ? args[:scope] : nil
+        @attach_scope = args[:attach_scope].present? ? args[:attach_scope] : nil
         @display = args[:display].present? ? args[:display] : :show
         @searchable = args[:searchable] == true
         @description = args[:description]

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.5.2.pre.3" unless const_defined?(:VERSION)
+  VERSION = "2.5.2.pre.4" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.5.2.pre.3
+  version: 2.5.2.pre.4
 platform: ruby
 authors:
 - Adrian Marin