effective_bootstrap 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2171c8eba6131331c93de9c19480cb8e561192bc97b584d2eba5c7715e858714
-  data.tar.gz: a6b2d20a34f91470fdca3f7288f6007f56a0cd5f621b2411c25446bbf20ddcf4
+  metadata.gz: a26936633589ef2e153a0e049c3fa824a1fcc76dcadc9d07e20b1fb8603328c8
+  data.tar.gz: 9a6b89211ee2177686cc617b4a283935e6c22130388f342a5207f6e1a7fbac0e
 SHA512:
-  metadata.gz: 6c72176995e888db8af16d0490b790a2bbd3dc09ab951d8fb2d5d7fd7a5ffc9925b9de9661478653fd8bad8b5990d97ca9d83ce06939126483b46d424fc53263
-  data.tar.gz: 01d7d6974daa925491d2888ab18a9bb844719e9d9ddf460f879e5dcfccaee46df62aef8ac972e57d902d7836c29fb276bef2a234195b731de9c166f85486b80d
+  metadata.gz: c111066e4ccaa58c9369bc153abd4951aa20cc935f5c7c96f8e5a6888e4492bfaa0d0be182c73820bf7687fa3d20337aa02773ecb07108bcbba47a8bec667d66
+  data.tar.gz: 05d73aa6f587cf17970441864442f075e211b53f356a9c8e91bf66bcbc79a6e6c1f34aaa9e183112ada7611962d5e2e8eb027ab79c24465865048d008c19ca51

data/app/helpers/effective_bootstrap_helper.rb

@@ -316,7 +316,7 @@ module EffectiveBootstrapHelper
   def nav_link_to(resource, path, opts = {})
     return if resource.kind_of?(Class) && !EffectiveResources.authorized?(self, :index, resource)
 
-    label = effective_bootstrap_human_name(resource, plural: true, prefer_model_name: true)
+    label = opts.delete(:label) || effective_bootstrap_human_name(resource, plural: true, prefer_model_name: true)
 
     if @_nav_mode == :dropdown  # We insert dropdown-items
       return link_to(label, path, merge_class_key(opts, 'dropdown-item'))
@@ -331,6 +331,7 @@ module EffectiveBootstrapHelper
     end
   end
 
+
   def nav_dropdown(label, right: false, groups: false, link_class: [], list_class: [], &block)
     raise 'expected a block' unless block_given?
 
@@ -371,6 +372,25 @@ module EffectiveBootstrapHelper
     content_tag(:div, '', class: 'dropdown-divider')
   end
 
+  # These two are used for advanced menus. When using content_for to capture inside nav dropdowns
+  def nav_content_for(name, &block)
+    raise('expected a block') unless block_given?
+    content_for(name) { yield }
+  end
+
+  def nav_dropdown_content_for(name, &block)
+    raise('expected a block') unless block_given?
+
+    original = @_nav_mode
+
+    begin
+      @_nav_mode = :dropdown
+      content_for(name) { yield }
+    ensure
+      @_nav_mode = original
+    end
+  end
+
   # Breadcrumb
   #
   # https://getbootstrap.com/docs/4.0/components/breadcrumb/
@@ -631,9 +651,13 @@ module EffectiveBootstrapHelper
   end
 
   def effective_bootstrap_human_name(resource, plural: false, prefer_model_name: false)
-    return resource.to_s unless resource.respond_to?(:model_name)
-
-    if resource.kind_of?(ActiveRecord::Relation) || plural
+    if resource.kind_of?(String)
+      resource
+    elsif resource.respond_to?(:datatable_name)
+      et(resource)
+    elsif resource.respond_to?(:model_name) == false
+      resource.to_s
+    elsif resource.kind_of?(ActiveRecord::Relation) || plural
       ets(resource)
     elsif resource.kind_of?(Class) || prefer_model_name
       et(resource)

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.12.3'.freeze
+  VERSION = '0.12.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails