effective_resources 2.7.15 → 2.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d09c8f004df1def2c6a2cebc8fd78ce3335138ccd5934b7803cc740663b94a84
-  data.tar.gz: 45e2a292a727c4a810b959cc0880dff2d0a2ce150ae7afba7fcfed5715322c65
+  metadata.gz: 8d6b751ebab2af1f4b5ce1a6023628b4f71708c9201588827ca85b5463fddb94
+  data.tar.gz: 94016eb862f9a86023b4bbafc085ace95fe691b91a8d2306a7be8fd4496ce5dc
 SHA512:
-  metadata.gz: a1e4d8ce6a7651ef6a75eb3d9e5db2f46b38bd2d6d399b26ad32d5c9cb1b38751cf2e0df139d916afdc0bf067ed07c67f8d3b3c7211faa6a7e82cb2189a8d7b7
-  data.tar.gz: 3de7ab00c232373fc66c4254cdc49457b84c4bb32e53951ed50e94adab89f3819c8e659fd37ce88c8707b6f609877474d7c7da26cb70c8762b6ebe16c61c5abc
+  metadata.gz: 84623889aa71be0d8a29af1c09c03392543ba979a8d0c9c488b2cf50b2907df38ff0944bb75c8276a87542b645064ba6f69038c96d3a69dca36a0ab43eb06e1b
+  data.tar.gz: e211971173259ea986f4f9fabb7801b5d1f161ec121b71bcdcadc1ab2e7869e37f1d7b4847b4e6d14cfc8953fba3a421dc443a5f59cd82dedefc3d6a67328a32

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/relation.rb

@@ -61,7 +61,7 @@ module Effective
             .order(Arel.sql("EXTRACT(hour from #{sql_column}) #{sql_direction}, EXTRACT(minute from #{sql_column}) #{sql_direction}"))
         else
           relation
-            .order(Arel.sql("#{sql_column} #{sql_direction}"))
+            .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
         end
       end
 

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.15'.freeze
+  VERSION = '2.7.17'.freeze
 end

metadata

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