pg_rails 7.3.1 → 7.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad67165e1aad7f3b3e31dd236706d4b923eb2139740a095018257899b43928a7
-  data.tar.gz: f3d907a47d97cb7abbfb0e148bb2c2e9466a5255284f14f06c0363966e35e46b
+  metadata.gz: 0fed6890bca7d59c4f1050a017f8268a137520f41464181a4b2ea56b2e44c5ae
+  data.tar.gz: f87ebe6627025fb2759466ba0539ce7b5b7ecf683fb2e56c49a29a69cb18d4ca
 SHA512:
-  metadata.gz: 3d8482db6b3b8455c819d4db06db374e40785cec70a9737bfca652c2368bddad17ca7a2d3656e1632b48b0ebeb03c5142e83855d3d70cfd9d043de3e7d34609d
-  data.tar.gz: e6e2457ac2a84097209da469aa76dd2538e72c9da05ed383884c19fceddc071b5dc515a82c444c4f3487d7912ca79790bd6eb06f0eed0ae0c4caf48e8797884f
+  metadata.gz: 7674b3fe89df77f6435356ef54cc181e20163b036c4ede84812aa056605071fd2bc0d2293fa03ec5a2fbda29b9b5bb42da9cd00109843579eb7f158a7cc4bc19
+  data.tar.gz: b8070967ee5b9f6ac03861a78c85313dd65ad42f5675851efc0b9742d1449820925c5cb1416e8f69257a4db2a04ec2df5977a30bb8d0ab9c8dd1aedbe8f7ada0

data/pg_engine/app/controllers/pg_engine/devise_controller.rb

@@ -1,6 +1,9 @@
 module PgEngine
   class DeviseController < ApplicationController
     before_action :configure_permitted_parameters
+    before_action do
+      @no_main_frame = true
+    end
 
     layout :layout_by_user
 

data/pg_engine/app/decorators/pg_engine/base_record_decorator.rb

@@ -64,11 +64,13 @@ module PgEngine
     def edit_link(text: ' Modificar', klass: 'btn-warning')
       return unless Pundit.policy!(Current.user, object).edit?
 
+      modal = object.class.default_modal
+
       helpers.content_tag :span, rel: :tooltip, title: 'Modificar' do
         helpers.link_to edit_object_url,
                         class: "btn btn-sm #{klass}",
-                        'data-turbo-frame': 'modal_content',
-                        'data-turbo-stream': true do
+                        'data-turbo-frame': modal ? 'modal_content' : '_top',
+                        'data-turbo-stream': modal do
           helpers.content_tag(:span, nil, class: clase_icono('pencil')) + text
         end
       end
@@ -77,11 +79,13 @@ module PgEngine
     def show_link(text: '', klass: 'btn-light')
       return unless Pundit.policy!(Current.user, object).show?
 
+      modal = object.class.default_modal
+
       helpers.content_tag :span, rel: :tooltip, title: 'Ver' do
         helpers.link_to object_url,
                         class: "btn btn-sm #{klass}",
-                        'data-turbo-frame': 'modal_content',
-                        'data-turbo-stream': true do
+                        'data-turbo-frame': modal ? 'modal_content' : '_top',
+                        'data-turbo-stream': modal do
           helpers.content_tag(:span, nil, class: clase_icono('eye-fill')) + text
         end
       end
@@ -101,11 +105,13 @@ module PgEngine
     def new_link(klass: 'btn-warning')
       return unless Pundit.policy!(Current.user, object).new?
 
+      modal = object.class.default_modal
+
       helpers.content_tag :span, rel: :tooltip, title: submit_default_value do
         helpers.link_to(new_object_url,
                         class: "btn btn-sm #{klass}",
-                        'data-turbo-frame': 'modal_content',
-                        'data-turbo-stream': true) do
+                        'data-turbo-frame': modal ? 'modal_content' : '_top',
+                        'data-turbo-stream': modal) do
           helpers.content_tag(:span, nil,
                               class: clase_icono('plus').to_s) + "<span class='d-none d-sm-inline'> #{submit_default_value}</span>".html_safe
         end

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -59,9 +59,7 @@ html
       div
         = render partial: 'pg_layout/navbar' if @navbar.present?
         div
-          / FIXME: rename to main, use a constant
-          = turbo_frame_tag current_turbo_frame || 'top',
-              **{ 'data-turbo-action': (turbo_frame? ? nil : :advance) }.compact do
+          - captured_content = capture do
             - if user_signed_in? && breadcrumbs.any?
               .d-flex.d-print-none
                 .d-flex.flex-grow-1.px-3.py-1[
@@ -103,6 +101,13 @@ html
                       hacer un container con position absolute para los toasts
             = yield(:filtros)
             = content
+          - if @no_main_frame
+            = captured_content
+          - else
+            / FIXME: rename to main, use a constant
+            = turbo_frame_tag current_turbo_frame || 'top',
+                **{ 'data-turbo-action': (turbo_frame? ? nil : :advance) }.compact do
+              = captured_content
 
           div style="width:100%; height: 10em"
           .d-flex.gap-1.justify-content-center.opacity-50 data-controller="theme"

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.3.1'
+  VERSION = '7.3.3'
 end

data/pg_scaffold/lib/generators/pg_rspec/scaffold/templates/controller_spec.rb

@@ -170,6 +170,7 @@ RSpec.describe <%= controller_class_name %>Controller do
 <% else -%>
         post :create, params: { <%= nombre_tabla_completo_singular %>: valid_attributes }
 <% end -%>
+        # FIXME: redirect to target object
         expect(response).to redirect_to([:<%= ns_prefix.first %>, <%= class_name %>.last])
       end
     end
@@ -218,6 +219,7 @@ RSpec.describe <%= controller_class_name %>Controller do
 <% else -%>
         put :update, params: { id: <%= file_name %>.to_param, <%= nombre_tabla_completo_singular %>: valid_attributes }
 <% end -%>
+        # FIXME: redirect to target object
         expect(response).to redirect_to([:<%= ns_prefix.first %>, <%= file_name %>])
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 7.3.3
 platform: ruby
 authors:
 - Martín Rosso