brick 1.0.83 → 1.0.84

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fd1f37f0785af48f35bc1292e9eec44cd8ebc6a81a6ed7163e53aeaeb753ccc7
4
- data.tar.gz: e532a10b06419ce64369e7a397a8eb4d268d87dc5a18c936847ab693cbf159bb
3
+ metadata.gz: 07b4deda161c3a94822dd4c953d1c3983eb7c4eeed3106c7037a5f6b5c006f9d
4
+ data.tar.gz: bd5bcd1255bd5e3c13da8abca6bc9b73b5cd17880f90bbbb6b3b6e01c7f9331d
5
5
  SHA512:
6
- metadata.gz: 7d9dbf20d1bcdc3d3ac2beaf905392ba4990574a8165c1111bdb8f035bd8b53765f1555bd672da134cd342edadb45a2b62151e49cfa6279ebc957f16d34fc449
7
- data.tar.gz: 276c8e4b831a866baa1b4e84a288a0137ae19afba54d08d342432f358ff4b7a45f234521c35f6d1a6ab96fd69ceb68aa30ba41bfb4b18caef7a12e25cedec8ed
6
+ metadata.gz: 0da12600c16ad515c1be1129940eba12e99754afebb206784384084dfee66c657ee2e6c9319f3b8f5d3a57c42f0f501ae55d967dd51b3f12b608579f98b5141d
7
+ data.tar.gz: 75a9e6de7852fb5aab7c6b7a4a72e2e2af733ad18432fe91f04207138e6192dcbc716e5a38e18819d22cfe2370acdd55c87d25e54b49f86493e52b1f3625dfa3
@@ -877,12 +877,19 @@ if Object.const_defined?('ActionView')
877
877
  if klass_or_obj
878
878
  if klass_or_obj.is_a?(ActiveRecord::Relation)
879
879
  klass_or_obj.where_values_hash.each do |whr|
880
- filter_parts << "#{whr.first}=#{whr.last}" unless whr.last.is_a?(Array)
880
+ filter_parts << "#{whr.first}=#{whr.last}" if whr.last && !whr.last.is_a?(Array)
881
881
  end
882
882
  klass_or_obj = klass_or_obj.klass
883
+ type_col = klass_or_obj.inheritance_column
884
+ if klass_or_obj.column_names.include?(type_col) && klass_or_obj.name != klass_or_obj.base_class.name
885
+ filter_parts << "#{type_col}=#{klass_or_obj.name}"
886
+ end
887
+ elsif klass_or_obj.is_a?(ActiveRecord::Base) && klass_or_obj.new_record?
888
+ klass_or_obj = klass_or_obj.class
883
889
  end
884
890
  filter = "?#{filter_parts.join('&')}" if filter_parts.present?
885
- if klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base
891
+ if (klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base) ||
892
+ (klass_or_obj&.is_a?(ActiveRecord::Base) && klass_or_obj.new_record? && (klass_or_obj = klass_or_obj.class))
886
893
  lt_args = [text || "Index for #{klass_or_obj.name.pluralize}",
887
894
  "#{send("#{klass_or_obj._brick_index}_path")}#{filter}"]
888
895
  else
@@ -5,7 +5,7 @@ module Brick
5
5
  module VERSION
6
6
  MAJOR = 1
7
7
  MINOR = 0
8
- TINY = 83
8
+ TINY = 84
9
9
 
10
10
  # PRE is nil unless it's a pre-release (beta, RC, etc.)
11
11
  PRE = nil
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: brick
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.83
4
+ version: 1.0.84
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lorin Thwaits