effective_resources 2.7.14 → 2.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e348fb91874d5f0cbc26e66ca5b72350f1dd3ee7526a77cbb8b4b68210eac61
-  data.tar.gz: b8a26a5cb4153306f16d2bcdf418d54aeb2dcc3b1c35c8424c8782f0a38e4110
+  metadata.gz: 3812994d8dd5978a7e5b6162cc1fa6f041b1a119a33d0688934d7eb5f73aeb42
+  data.tar.gz: 5f884447a4d2c02318a97cd966ae729613926c123a99282fee92a44a859a653b
 SHA512:
-  metadata.gz: 6e85c5cf8dba9f643b3cd9a14987c44d28f65b1793c6a81dce5596c66fec1903a4972bd3967610ef39782ea22c62d080f49efce92430f37cfbae77281dbbddda
-  data.tar.gz: eec4d7fe863db7d2001bddae2c8afa51f0d144a432e54ccca37f697d922ecb375ae92c3f166c877ff761dd0c05a48419a17e85c4a2bb6653fa27fdd7ce4db0e8
+  metadata.gz: 47b4d0ff41beeb1743b510cec5e74f209fbe311999931c4381e68d6ef7298f1bd3285224273bbb83deb30880910d9214c5f1c1796a3153d1358a0da0eb2e75c7
+  data.tar.gz: 35dd5881060ea91a9254537aafac5ff3105fd250782f7e2fc009a97957b0158b03edd37bd1e56a53f636d7817493989b40ec474ee71e8b1957595c9e981bbe38

data/app/controllers/admin/select2_ajax_controller.rb

@@ -19,10 +19,33 @@ module Admin
       end
     end
 
+    def organizations
+      raise('the effective memberships gem is required') unless defined?(EffectiveMemberships)
+
+      klass = EffectiveMemberships.Organization
+      raise('an EffectiveMemberships.Organization is required') unless klass.try(:effective_memberships_organization?)
+
+      collection = klass.all
+
+      if collection.respond_to?(:to_select2)
+        collection = collection.to_select2
+      elsif collection.respond_to?(:sorted)
+        collection = collection.sorted
+      end
+
+      respond_with_select2_ajax(collection) do |organization|
+        { id: organization.to_param, text: organization.try(:to_select2) || to_select2(organization) }
+      end
+    end
+
     private
 
-    def to_select2(user)
-      "<span>#{user}</span> <small>#{user.email}</small>"
+    def to_select2(resource)
+      if resource.try(:email).present?
+        "<span>#{resource}</span> <small>#{resource.email}</small>"
+      else
+        "<span>#{resource}</span>"
+      end
     end
 
   end

data/app/models/effective/resources/forms.rb

@@ -75,7 +75,14 @@ module Effective
           if res.klass.unscoped.respond_to?(:datatables_scope)
             { collection: res.klass.datatables_scope.map { |obj| [obj.to_s, obj.id] } }
           elsif res.klass.unscoped.respond_to?(:datatables_filter)
-            { collection: res.klass.datatables_filter.map { |obj| [obj.to_s, obj.id] } }
+            collection = res.klass.datatables_filter
+
+            if collection.kind_of?(Array)
+              { collection: collection }
+            else
+              { collection: collection.map { |obj| [obj.to_s, obj.id] } }
+            end
+
           elsif res.klass.unscoped.respond_to?(:sorted)
             { collection: res.klass.sorted.map { |obj| [obj.to_s, obj.id] } }
           else

data/config/routes.rb

@@ -7,6 +7,7 @@ EffectiveResources::Engine.routes.draw do
   namespace :admin do
     resources :select2_ajax, only: [] do
       get :users, on: :collection
+      get :organizations, on: :collection
     end
   end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.14'.freeze
+  VERSION = '2.7.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.7.14
+  version: 2.7.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails