brick 1.0.198 → 1.0.200

data/lib/brick/frameworks/rails/engine.rb

@@ -788,20 +788,13 @@ window.addEventListener(\"popstate\", linkSchemas);
                                 next if rel.first.blank? || rel.last[:cols].empty? ||
                                         ::Brick.config.exclude_tables.include?(rel.first)
 
-                                tbl_parts = rel.first.split('.')
-                                if (aps = rel.last.fetch(:auto_prefixed_schema, nil))
-                                  tbl_parts << tbl_parts.last[aps.length..-1]
-                                  aps = aps[0..-2] if aps[-1] == '_'
-                                  tbl_parts[-2] = aps
-                                end
-                                tbl_parts.shift if tbl_parts.first == apartment_default_schema
                                 # %%% When table_name_prefixes are use then during rendering empty non-TNP
                                 # entries get added at some point when an attempt is made to find the table.
                                 # Will have to hunt that down at some point.
                                 if (rowcount = rel.last.fetch(:rowcount, nil))
                                   rowcount = rowcount > 0 ? " (#{rowcount})" : nil
                                 end
-                                s << "<option value=\"#{::Brick._brick_index(rel.first, nil, '/')}\">#{rel.first}#{rowcount}</option>"
+                                s << "<option value=\"#{::Brick._brick_index(rel.first, nil, '/', nil, true)}\">#{rel.first}#{rowcount}</option>"
                               end.html_safe
               prefix = "#{::Brick.config.path_prefix}/" if ::Brick.config.path_prefix
               table_options << "<option value=\"#{prefix}brick_status\">(Status)</option>".html_safe if ::Brick.config.add_status
@@ -1623,7 +1616,7 @@ end %>#{"
 <td><%= link_to_brick(
    ::Brick::Rails::AA_PNG.html_safe,
    { show_proc: Proc.new do |aa_model, relation|
-                  path_helper = \"#\{ns}_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{rk = aa_model.model_name.singular_route_key}_path\".to_sym
+                  path_helper = \"#\{ns}_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{aa_model.model_name.singular_route_key}_path\".to_sym
                   send(path_helper, obj) if respond_to?(path_helper)
                 end,
      title: \"#\{page_title} in ActiveAdmin\" }
@@ -1962,34 +1955,6 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
           end # TemplateRenderer
         end
 
-        if ::Brick.enable_routes?
-          require 'brick/route_mapper'
-          ActionDispatch::Routing::RouteSet.class_exec do
-            # In order to defer auto-creation of any routes that already exist, calculate Brick routes only after having loaded all others
-            prepend ::Brick::RouteSet
-          end
-          ActionDispatch::Routing::Mapper.class_exec do
-            include ::Brick::RouteMapper
-          end
-
-          # Do the root route before the Rails Welcome one would otherwise take precedence
-          if (route = ::Brick.config.default_route_fallback).present?
-            action = "#{route}#{'#index' unless route.index('#')}"
-            if ::Brick.config.path_prefix
-              ::Rails.application.routes.append do
-                send(:namespace, ::Brick.config.path_prefix) do
-                  send(:root, action)
-                end
-              end
-            elsif ::Rails.application.routes.named_routes.send(:routes)[:root].nil?
-              ::Rails.application.routes.append do
-                send(:root, action)
-              end
-            end
-            ::Brick.established_drf = "/#{::Brick.config.path_prefix}#{action[action.index('#')..-1]}"
-          end
-        end
-
         # Just in case it hadn't been done previously when we tried to load the brick initialiser,
         # go make sure we've loaded additional references (virtual foreign keys and polymorphic associations).
         # (This should only happen if for whatever reason the initializer file was not exactly config/initializers/brick.rb.)

data/lib/brick/frameworks/rails/form_tags.rb

@@ -73,7 +73,7 @@ module Brick::Rails::FormTags
           <td>#{link_to_brick(
             ::Brick::Rails::AA_PNG.html_safe,
             { index_proc: Proc.new do |aa_model, relation|
-                            path_helper = "#{ns}_#{relation.fetch(:auto_prefixed_schema, nil)}#{rk = aa_model.model_name.route_key}_path".to_sym
+                            path_helper = "#{ns}_#{relation.fetch(:auto_prefixed_schema, nil)}#{aa_model.model_name.route_key}_path".to_sym
                             send(path_helper) if respond_to?(path_helper)
                           end,
               title: "#{klass.name} in ActiveAdmin" }
@@ -137,7 +137,7 @@ module Brick::Rails::FormTags
                options[col[1].inheritance_column] = col[1].name unless col[1] == col[1].base_class
                x_order = " x-order=\"#{col_name}\"" if true
                s << "#{x_order}>#{col[2]} "
-               s << (col.first ? "#{col[3]}" : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
+               s << (col.first ? col[3].to_s : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
              elsif cust_cols.key?(col_name) # Custom column
                x_order = " x-order=\"#{col_name}\"" if true
                s << "#{x_order}>#{col_name}"
@@ -222,7 +222,7 @@ module Brick::Rails::FormTags
                 out << link_to(ho_txt, send("#{hm_klass.base_class._brick_index(:singular)}_path".to_sym, ho_id))
               end
             elsif obj.respond_to?(ct_col = hms_col[1].to_sym) && (ct = obj.send(ct_col)&.to_i)&.positive?
-              predicates = hms_col[2].each_with_object({}) { |v, s| s["__#{v.first}"] = v.last.is_a?(String) ? v.last : obj.send(v.last) }
+              predicates = hms_col[2].each_with_object({}) { |v, s| s["__#{v.first}"] = v.last.is_a?(String) ? v.last : obj.send(v.last) if v.last }
               predicates.each { |k, v| predicates[k] = klass.name if v == '[sti_type]' }
               out << "#{link_to("#{ct || 'View'} #{hms_col.first}",
                                 send("#{hm_klass._brick_index}_path".to_sym, predicates))}\n"