effective_orders 6.8.1 → 6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b17d6da43052c30b3dc2e8b4ed1cb60722737444cdbc9246ebe8c1649500d9b7
-  data.tar.gz: 15463f7b06e80a2c4af84951338cedbc11f1f235e83daae1ca440f89d6ed6f7e
+  metadata.gz: 3564d400d398b71b8799a81b8668ba35aee5e69e222d3849ff4903e94338de67
+  data.tar.gz: 9905c4d6d0364f2b0b30e5752de9809fb2fd765124ac61d9f2f79e7c753e6bd6
 SHA512:
-  metadata.gz: 74c5371ed6996eb16b848fb534da9f65671467e8c163ab6bf4802c9c8485c44782991401ba089f69db8494b3b315e6aab42f919920af1c2f1a4b5b9d2104b062
-  data.tar.gz: be68655d47cc0efb3ea00fce27fe750e4a5d862e0be4ebfc2e734c607cd476a3184533369410328361602e7ca4f65396ce31b890debdc290f2ea1e825e124296
+  metadata.gz: 6d7eba677128528f63a37143ada91e7c501aeb52a0a90715acf6615543e420309bfcf02df64e68cecdefe9847db022bdf2750cac8d4dcc2e046e61e78c6ee834
+  data.tar.gz: 3fa0dad90dc8ea85190b1f234f5ba717ba14520e1956468cfafa94e182ae253213e9dc181a15d7124733b18ea642d5af0c80893ea6fdc097c865d9524c2ce1e5

data/app/datatables/admin/effective_orders_datatable.rb

@@ -55,6 +55,10 @@ module Admin
         col :email, visible: false
       end
 
+      if attributes[:organization_id].blank?
+        col :organization
+      end
+
       col :parent, visible: false, search: :string
 
       col :cc, visible: false
@@ -111,10 +115,14 @@ module Admin
         user_klass = (attributes[:user_type].constantize if attributes[:user_type].present?)
         user_klass ||= current_user.class
 
-        user = user_klass.find(attributes[:user_id])
+        user = user_klass.where(id: attributes[:user_id]).first!
         scope = scope.where(user: user)
       end
 
+      if attributes[:organization_id].present? && attributes[:organization_type].present?
+        scope = scope.where(organization_id: attributes[:organization_id], organization_type: attributes[:organization_type])
+      end
+
       if attributes[:parent_id].present? && attributes[:parent_type].present?
         scope = scope.where(parent_id: attributes[:parent_id], parent_type: attributes[:parent_type])
       end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.8.1'.freeze
+  VERSION = '6.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 6.8.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails