effective_resources 2.27.5 → 2.27.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c1dbb4bd3ecd4aa786821aeb0bf9674f0c36844910b6d054236a46f01547653
-  data.tar.gz: 1f7574dd6e4ea2e0cd028f6bec740b8d83b7b0f3f7b8f49d84b4a4d1e6602d19
+  metadata.gz: fe8440ed218c2d7d5daf41701ac71d32bd8c543010d73e8abafe01de907b3132
+  data.tar.gz: 4289ee28dcdce802f9de6c68432c82e41ef0d936ccc003bf079b192adb8bfe6a
 SHA512:
-  metadata.gz: 7836705d30eb12466257455eb985aabe3b377665d44fc5a09d3554569ed90cdd8b0cadfc6987138ffc22cb16b9515f9ca6d1cdf5ebc796b34d90e5cad9d5fabd
-  data.tar.gz: e2697f2a5d79702cb97d1a605fdf0a8a5fd0cd6db898120a5f4f60e2500f4cf23dffdc513b1fd48a8ecf8d207ba92925ff13554c91083bda502cf54f75408105
+  metadata.gz: 51107612aa3948a183a908314ccf0865bf44fb500382bf5d216f1695057b194ec6e588129080ae6dcbd725e2c8cbb655594fcfa806941ba4c0a9819703e935e4
+  data.tar.gz: a111a2440667f067d275193781cae39eb5ecb612576fe22250c704a8fbb647f89008c37958db8bd5c8c0c27fa5c3bf0882421e0235065a90e44ed8ebe589689f

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -102,7 +102,7 @@ module Effective
         self.resource ||= resource_scope.find(params[:id])
 
         EffectiveResources.authorize!(self, :show, resource)
-        @page_title ||= resource.to_s
+        @page_title ||= view_context.strip_tags(resource.to_s)
 
         run_callbacks(:resource_render)
 
@@ -118,7 +118,7 @@ module Effective
         self.resource ||= resource_scope.find(params[:id])
 
         EffectiveResources.authorize!(self, :edit, resource)
-        @page_title ||= "Edit #{resource}"
+        @page_title ||= "Edit " + view_context.strip_tags(resource.to_s)
 
         run_callbacks(:resource_render)
 
@@ -135,7 +135,7 @@ module Effective
         action = (commit_action[:action] == :save ? :update : commit_action[:action])
 
         EffectiveResources.authorize!(self, action, resource)
-        @page_title ||= "Edit #{resource}"
+        @page_title ||= "Edit " + view_context.strip_tags(resource.to_s)
 
         if respond_to?(:current_user) && resource.respond_to?(:current_user=)
           resource.current_user ||= current_user
@@ -165,7 +165,7 @@ module Effective
         action = :destroy
 
         EffectiveResources.authorize!(self, action, resource)
-        @page_title ||= "Destroy #{resource}"
+        @page_title ||= "Destroy " + view_context.strip_tags(resource.to_s)
 
         if save_resource(resource, action)
           respond_with_success(resource, action)
@@ -180,7 +180,7 @@ module Effective
         self.resource ||= resource_scope.find(params[:id])
 
         EffectiveResources.authorize!(self, action, resource)
-        @page_title ||= "#{action.to_s.titleize} #{resource}"
+        @page_title ||= action.to_s.titleize + " " + view_context.strip_tags(resource.to_s)
 
         if request.get?
           run_callbacks(:resource_render)

data/app/controllers/concerns/effective/select2_ajax_controller.rb

@@ -2,8 +2,12 @@ module Effective
   module Select2AjaxController
     extend ActiveSupport::Concern
 
-    def respond_with_select2_ajax(collection, skip_search: false, skip_authorize: false, skip_scope: false, &block)
-      raise('collection should be an ActiveRecord::Relation') unless collection.kind_of?(ActiveRecord::Relation)
+    def respond_with_select2_ajax_array(collection, skip_search: true, skip_authorize: true, skip_scope: true, skip_paginate: true, skip_relation: true, &block)
+      respond_with_select2_ajax(collection, skip_search: skip_search, skip_authorize: skip_authorize, skip_scope: skip_scope, skip_paginate: skip_paginate, skip_relation: skip_relation, &block)
+    end
+
+    def respond_with_select2_ajax(collection, skip_search: false, skip_authorize: false, skip_scope: false, skip_paginate: false, skip_relation: false, &block)
+      raise('collection should be an ActiveRecord::Relation or Array') unless collection.kind_of?(ActiveRecord::Relation) || skip_relation
 
       # Authorize
       EffectiveResources.authorize!(self, :index, collection.klass) unless skip_authorize
@@ -27,13 +31,15 @@ module Effective
       end
 
       # Paginate
-      per_page = 50
-      page = (params[:page] || 1).to_i
-      last = (collection.reselect(:id).count.to_f / per_page).ceil
-      more = page < last
-
-      offset = [(page - 1), 0].max * per_page
-      collection = collection.limit(per_page).offset(offset)
+      if !skip_paginate
+        per_page = 50
+        page = (params[:page] || 1).to_i
+        last = (collection.reselect(:id).count.to_f / per_page).ceil
+        more = page < last
+  
+        offset = [(page - 1), 0].max * per_page
+        collection = collection.limit(per_page).offset(offset)
+      end
 
       # Results
       results = collection.map do |resource|

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.27.5'.freeze
+  VERSION = '2.27.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.27.5
+  version: 2.27.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails