effective_bootstrap 0.13.5 → 0.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85c9a43f0ea2e678b77110864386344bfc738bbd199a8cf1a7199aad0475c8d
-  data.tar.gz: c13a58b9778f127a64907d13d3ceea1a1653399da29b99dfa0f002ccbeecd754
+  metadata.gz: 284baa0c03bb5e8427d7e4ac3ce4fb6725e359ab3bea1f6f267e4c7d2b6b0e5e
+  data.tar.gz: bb1d75ae10d211fb2c145e7351be9a63b0610360e1c628a00dac1c73de7bbc78
 SHA512:
-  metadata.gz: b0242f4304b077bea11d982d163ead7a0c04b17af250f3f29e277d3470215e63392d8f0acefedc60e9dd692f278f3aafabff16538e989531bbe4e21a142b3f96
-  data.tar.gz: 7e402ffa6c5474842c436ab47bfbdfcb06fc807bd99b5d918bd79e8cb5b020d7350c5c03304de2862b7f40b2e43c0d2dc39b851080d856353159d3e1ba368619
+  metadata.gz: fac47682801276341b664baae31f366030d80c16273bca7bf66c10a4983c6276e57c67431a3f4f12b7bb62f91b00a7ec44422642761bd9bc7f2ac0a2b40c85bd
+  data.tar.gz: b01e15de8b3d61360fc72c48e58b4557091c723fa73d8dc712e0c0f62db0969dfda9e01ff4baa81fe9986d6c7c781a31ef094592730d39aa91755ee2fa75f0f9

data/app/assets/stylesheets/effective_bootstrap/forms.scss

@@ -72,27 +72,19 @@ div.form-group > label + .btn-group { display: block; }
 .form-control-file { border: none !important; }
 
 // Radios
-form fieldset.effective-radios {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-form fieldset.effective-checks {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
 form fieldset.effective-radios legend {
   font-size: 1rem;
-  font-weight: inherit;
   margin-top: 0.5rem;
   margin-bottom: 1rem;
 }
 
+form fieldset.effective-radios {
+  > label { margin-bottom: 0.5rem; }
+}
+
 // Checks
 form fieldset.effective-checks > label {
   font-size: 1rem;
-  font-weight: inherit;
   margin-top: 0.5rem;
   margin-bottom: 1rem;
 }

data/app/models/effective/table_builder.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class TableBuilder
-    FILTER_PARAMETERS = [:password, :password_confirmation, :created_at, :updated_at]
+    FILTER_PARAMETERS = [:password, :password_confirmation, :status_steps, :wizard_steps, :token, :created_at, :updated_at]
 
     attr_accessor :object, :template, :options
 
@@ -54,14 +54,20 @@ module Effective
     end
 
     def build_resource_rows
-      Effective::Resource.new(object).klass_attributes(sort: true).each do |name, options|
+      Effective::Resource.new(object).resource_attributes.each do |name, options|
         case options.first
+        when :belongs_to
+          belongs_to(name)
+        when :effective_address
+          effective_address(name)
         when :boolean
           boolean_row(name)
+        when :integer
+          name.to_s.end_with?('price') ? price_field(name) : text_field(name)
+        when :string
+          name.to_s.include?('email') ? email_field(name) : text_field(name)
         when :text
           text_area(name)
-        when :string
-          (name.to_s.include?('email') && value(name).to_s.include?('@')) ? email_field(name) : text_field(name)
         else default_row(name)
         end
       end
@@ -109,6 +115,10 @@ module Effective
     alias_method :checks, :collection_row
     alias_method :radios, :collection_row
 
+    def belongs_to(name, options = {})
+      rows[name] = TableRows::BelongsTo.new(name, options, builder: self).to_html
+    end
+
     def email_field(name, options = {})
       rows[name] = TableRows::EmailField.new(name, options, builder: self).to_html
     end

data/app/models/effective/table_row.rb

@@ -16,6 +16,10 @@ module Effective
       @options = options
     end
 
+    def controller_namespace
+      Effective::Resource.new(template.controller.controller_path).namespace
+    end
+
     # Intended for override
     def content
       value

data/app/models/effective/table_rows/belongs_to.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Effective
+  module TableRows
+    class BelongsTo < Effective::TableRow
+
+      def content
+        if value.present?
+          content_tag(:div) { link_to_edit || link_to_show || value.to_s }
+        end
+      end
+
+      private
+
+      def effective_resource
+        @effective_resource ||= Effective::Resource.new(value, namespace: controller_namespace)
+      end
+
+      def link_to_edit
+        return unless EffectiveResources.authorized?(template, :edit, value)
+
+        path = effective_resource.action_path(:edit, value)
+        return unless path.present?
+
+        link_to(value.to_s, path, title: value.to_s, target: '_blank')
+      end
+
+      def link_to_show
+        return unless EffectiveResources.authorized?(template, :show, value)
+
+        path = effective_resource.action_path(:show, value)
+        return unless path.present?
+
+        link_to(value.to_s, path, title: value.to_s, target: '_blank')
+      end
+
+    end
+  end
+end

data/app/models/effective/table_rows/text_area.rb

@@ -5,7 +5,7 @@ module Effective
     class TextArea < Effective::TableRow
 
       def content
-        template.simple_format(value) if value.present?
+        template.simple_format(value) if value.kind_of?(String)
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.13.5'.freeze
+  VERSION = '0.13.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.13.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -696,6 +696,7 @@ files:
 - app/models/effective/form_logics/show_if_any.rb
 - app/models/effective/table_builder.rb
 - app/models/effective/table_row.rb
+- app/models/effective/table_rows/belongs_to.rb
 - app/models/effective/table_rows/boolean.rb
 - app/models/effective/table_rows/collection.rb
 - app/models/effective/table_rows/content_for.rb