brick 1.0.248 → 1.0.250

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1b54ee47db7637a4122bccb3fdcb613550aae57632bc6ce590851307085da2
-  data.tar.gz: 1f80b6c273b32df62b8b00f1251c9eea3322ecfd8cc308472cce4dbfecb85866
+  metadata.gz: 8dfd58af439d004894147bf5e1e568c791e2044d48f945aa22fa89a8e46d3efa
+  data.tar.gz: 166b4869016f55f710f4124e8eb9d1ca4531c29a5e4c83e7c32dc661cf429c21
 SHA512:
-  metadata.gz: abb49248dc4466a54f892210db594acd481fe0292a21077fdc32e566855aabeca634b8ad5f9a4bef1d52c05e2aa798a4d24002f046e80bd285c19042db637d7e
-  data.tar.gz: a40eb65cfbd88e69e9b6dff165fbc4e83251b002cd445da9ad6a229841138311197fca25e22733c19e3ece186ecfbca882a35b7d64984ceaa3782571c65b181d
+  metadata.gz: 354fa85b9c8e24c6bfd3a970de0fa93aec8daede747bb14a32d9c9a8ead95e19a38bbad646b70fd74c5d8aed24a55b31c9acdf9a9ea4570b8d5f24853961f484
+  data.tar.gz: '0367903f7ff42ec1ac644b08e8462bf6297fccb34fac5f7cd92eb0f365e6af2e44c93d3a7bf216bf004366ba45a73f916607e2ff67141bfb1a68fc540fed5b65'

data/lib/brick/extensions.rb

@@ -441,7 +441,7 @@ module ActiveRecord
                           CGI.escapeHTML(assoc_name)
                         end
       model_path = ::Rails.application.routes.url_helpers.send("#{_brick_index || table_name}_path".to_sym)
-      model_path << "?#{self.inheritance_column}=#{self.name}" if self != base_class
+      model_path << "__?#{self.inheritance_column}=#{self.name}" if self != base_class
       av_class = Class.new.extend(ActionView::Helpers::UrlHelper)
       av_class.extend(ActionView::Helpers::TagHelper) if ActionView.version < ::Gem::Version.new('7')
       link = av_class.link_to(assoc_html_name ? name : assoc_name, model_path)

data/lib/brick/rails/engine.rb

@@ -1098,14 +1098,14 @@ if (window.brickFontFamily) {
       until this_model == base_model do
         this_model = this_model.superclass
         path = send(\"#\{this_model._brick_index}_path\")
-        path << \"?#\{base_model.inheritance_column}=#\{this_model.name}\" unless this_model == base_model
+        path << \"?__#\{base_model.inheritance_column}=#\{this_model.name}\" unless this_model == base_model
         parent_links << link_to(this_model.name, path)
       end
       \"<tr><td colspan=\\\"#\{td_count}\\\">Parent: #\{parent_links.join(' ')}</tr>\".html_safe
     end
 %><%= if (children = model.descendants).present?
   child_links = children.map do |child|
-    path = send(\"#\{child._brick_index}_path\") + \"?#\{base_model.inheritance_column}=#\{child.name}\"
+    path = send(\"#\{child._brick_index}_path\") + \"?__#\{base_model.inheritance_column}=#\{child.name}\"
     link_to(child.name, path)
   end
   \"<tr><td colspan=\\\"#\{td_count}\\\">Children: #\{child_links.join(' ')}</tr>\".html_safe
@@ -1406,7 +1406,7 @@ s << \"\\n  <br>\\n\"
 #{(inh_col = @_brick_model.inheritance_column).present? &&
 "    if obj.respond_to?(:#{inh_col}) && (model_name = @#{obj_name}.#{inh_col}) &&
        !model_name.is_a?(Numeric) && model_name != base_model.name
-      see_all_path << \"?#{inh_col}=#\{model_name}\"
+      see_all_path << \"?__#{inh_col}=#\{model_name}\"
     end
     model_name = base_model.name if model_name.is_a?(Numeric)"}
     model_name = nil if model_name == ''
@@ -1647,7 +1647,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
   var mermaidCode;
   var cbs = {<%= callbacks.map do |k, v|
                    path = send(\"#\{v._brick_index}_path\".to_sym)
-                   path << \"?#\{v.base_class.inheritance_column}=#\{v.name}\" unless v == v.base_class
+                   path << \"?__#\{v.base_class.inheritance_column}=#\{v.name}\" unless v == v.base_class
                    \"#\{k}: \\\"#\{path}\\\"\"
                  end.join(', ').html_safe %>};
   if (imgErd) imgErd.addEventListener(\"click\", showErd);

data/lib/brick/rails/form_tags.rb

@@ -807,7 +807,7 @@ function onImagesLoaded(event) {
                        klass, sti_type, rel_name = ::Brick.ctrl_to_klass(controller_path)
                        if klass
                          type_col = klass.inheritance_column # Usually 'type'
-                         filter_parts << "#{type_col}=#{sti_type}" if sti_type && klass.column_names.include?(type_col)
+                         filter_parts << "__#{type_col}=#{sti_type}" if sti_type && klass.column_names.include?(type_col)
                          path_params = request.path_parameters
                          pk = (klass.primary_key || ActiveRecord::Base.primary_key).to_sym
                          if ((id = (path_params[pk] || path_params[:id] || path_params["#{klass.name.underscore}_id".to_sym])) && (obj = klass.find_by(pk => id))) ||
@@ -829,7 +829,7 @@ function onImagesLoaded(event) {
                                                      .pluck(assoc_klass.primary_key).first)
                                foreign_id = new_id
                              end
-                             filter_parts << "#{path_param}=#{foreign_id}"
+                             filter_parts << "__#{path_param}=#{foreign_id}"
                            end
                            klass
                          end
@@ -839,7 +839,7 @@ function onImagesLoaded(event) {
     if klass_or_obj
       if klass_or_obj.is_a?(ActiveRecord::Relation)
         klass_or_obj.where_values_hash.each do |whr|
-          filter_parts << "#{whr.first}=#{whr.last}" if whr.last && !whr.last.is_a?(Array)
+          filter_parts << "__#{whr.first}=#{whr.last}" if whr.last && !whr.last.is_a?(Array)
         end
         klass_or_obj = klass_or_obj.klass
       end
@@ -849,7 +849,7 @@ function onImagesLoaded(event) {
       if klass_or_obj.is_a?(Class) && klass_or_obj <= ActiveRecord::Base
         type_col = klass_or_obj.inheritance_column
         if klass_or_obj.column_names.include?(type_col) && klass_or_obj.name != klass_or_obj.base_class.name
-          filter_parts << "#{type_col}=#{klass_or_obj.name}"
+          filter_parts << "__#{type_col}=#{klass_or_obj.name}"
         end
       end
       filter = "?#{filter_parts.join('&')}" if filter_parts.present?

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 248
+    TINY = 250
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.248
+  version: 1.0.250
 platform: ruby
 authors:
 - Lorin Thwaits