From 66676f009dee7a18953c6522ac59c103d206dafc Mon Sep 17 00:00:00 2001 From: jazzari Date: Mon, 15 Jan 2024 14:36:07 -0300 Subject: [PATCH 01/11] fix: corregido ocultar schema si es de subnivel #14949 --- app/views/schemas/_row.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/schemas/_row.haml b/app/views/schemas/_row.haml index 1d1fca87..8c91fe1e 100644 --- a/app/views/schemas/_row.haml +++ b/app/views/schemas/_row.haml @@ -10,4 +10,5 @@ -# XXX: Solo un nivel de recursividad - unless local_assigns[:parent_schema] - schema.schemas.each do |s| + - next if s.hidden? = render 'schemas/row', schema: s, site: site, filter: filter, parent_schema: schema From 4c58aea47a712aa1a6d91efbc6e886a5517c3b7f Mon Sep 17 00:00:00 2001 From: jazzari Date: Mon, 15 Jan 2024 14:50:11 -0300 Subject: [PATCH 02/11] fix: agregada linea segun CI:haml #14949 --- app/views/schemas/_row.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/schemas/_row.haml b/app/views/schemas/_row.haml index 8c91fe1e..40d2fec7 100644 --- a/app/views/schemas/_row.haml +++ b/app/views/schemas/_row.haml @@ -11,4 +11,6 @@ - unless local_assigns[:parent_schema] - schema.schemas.each do |s| - next if s.hidden? - = render 'schemas/row', schema: s, site: site, filter: filter, parent_schema: schema + + = render 'schemas/row', schema: s, site: site, filter: filter, + parent_schema: schema From 2796d3f2ca6bb2881b4d0dcdb7c03d713e6f9905 Mon Sep 17 00:00:00 2001 From: jazzari Date: Mon, 15 Jan 2024 15:11:55 -0300 Subject: [PATCH 03/11] fix: quitada linea agregada segun CI:haml #14949 --- app/views/schemas/_row.haml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/schemas/_row.haml b/app/views/schemas/_row.haml index 40d2fec7..48fd0ee7 100644 --- a/app/views/schemas/_row.haml +++ b/app/views/schemas/_row.haml @@ -11,6 +11,5 @@ - unless local_assigns[:parent_schema] - schema.schemas.each do |s| - next if s.hidden? - = render 'schemas/row', schema: s, site: site, filter: filter, parent_schema: schema From 1128f0495436777e95af4fcccbafde34ea4845db Mon Sep 17 00:00:00 2001 From: f Date: Mon, 25 Mar 2024 12:42:15 -0300 Subject: [PATCH 04/11] =?UTF-8?q?fix:=20mostrar=20los=20botones=20de=20inv?= =?UTF-8?q?itaci=C3=B3n=20en=20una=20sola=20l=C3=ADnea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/sites/index.haml | 53 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/app/views/sites/index.haml b/app/views/sites/index.haml index ed87180a..f771be3b 100644 --- a/app/views/sites/index.haml +++ b/app/views/sites/index.haml @@ -29,29 +29,30 @@ = site.title %p.lead= site.description %br - = link_to t('.visit'), site.url, class: 'btn btn-secondary' - - if rol.temporal - = button_to t('sites.invitations.accept'), - site_usuaries_accept_invitation_path(site), - method: :patch, - title: t('help.sites.invitations.accept'), - class: 'btn btn-secondary' - = button_to t('sites.invitations.reject'), - site_usuaries_reject_invitation_path(site), - method: :patch, - title: t('help.sites.invitations.reject'), - class: 'btn btn-secondary' - - else - - if policy(site).show? - = render 'layouts/btn_with_tooltip', - tooltip: t('help.sites.edit_posts'), - type: 'success', - link: site_path(site), - text: t('sites.posts') - - if policy(SiteUsuarie.new(site, current_usuarie)).index? - = render 'layouts/btn_with_tooltip', - tooltip: t('usuaries.index.help.self'), - text: t('usuaries.index.title'), - type: 'info', - link: site_usuaries_path(site) - = render 'sites/build', site: site + .d-flex.flex-row + = link_to t('.visit'), site.url, class: 'btn btn-secondary' + - if rol.temporal + = button_to t('sites.invitations.accept'), + site_usuaries_accept_invitation_path(site), + method: :patch, + title: t('help.sites.invitations.accept'), + class: 'btn btn-secondary' + = button_to t('sites.invitations.reject'), + site_usuaries_reject_invitation_path(site), + method: :patch, + title: t('help.sites.invitations.reject'), + class: 'btn btn-secondary' + - else + - if policy(site).show? + = render 'layouts/btn_with_tooltip', + tooltip: t('help.sites.edit_posts'), + type: 'success', + link: site_path(site), + text: t('sites.posts') + - if policy(SiteUsuarie.new(site, current_usuarie)).index? + = render 'layouts/btn_with_tooltip', + tooltip: t('usuaries.index.help.self'), + text: t('usuaries.index.title'), + type: 'info', + link: site_usuaries_path(site) + = render 'sites/build', site: site From 316b192d1e2bb5b504d9edfbba43de206c74404f Mon Sep 17 00:00:00 2001 From: f Date: Mon, 25 Mar 2024 12:42:26 -0300 Subject: [PATCH 05/11] fix: poder aceptar o rechazar invitaciones #15154 --- app/policies/site_usuarie_policy.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/policies/site_usuarie_policy.rb b/app/policies/site_usuarie_policy.rb index f07dc1c9..31e98cfe 100644 --- a/app/policies/site_usuarie_policy.rb +++ b/app/policies/site_usuarie_policy.rb @@ -36,8 +36,7 @@ class SiteUsuariePolicy end def accept_invitation? - su = site_usuarie - (usuarie? || invitade?) && su.usuarie.rol_for_site(su.site).temporal + !!site_usuarie.usuarie.rol_for_site(site_usuarie.site)&.temporal end def reject_invitation? From 1130bb791c70ff008e4e85eda48528d44ba5fd86 Mon Sep 17 00:00:00 2001 From: jazzari Date: Tue, 26 Mar 2024 15:01:59 -0300 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20borrado=20espacio=20extra=20en=20l?= =?UTF-8?q?=C3=ADnea=2014=20de=20=5Frow.haml=20#14949?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/schemas/_row.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/schemas/_row.haml b/app/views/schemas/_row.haml index 48fd0ee7..ece07727 100644 --- a/app/views/schemas/_row.haml +++ b/app/views/schemas/_row.haml @@ -11,5 +11,5 @@ - unless local_assigns[:parent_schema] - schema.schemas.each do |s| - next if s.hidden? - = render 'schemas/row', schema: s, site: site, filter: filter, - parent_schema: schema + = render 'schemas/row', schema: s, site: site, filter: filter, parent_schema: schema + From 6ceef5465fa4a75b163f684cd5479d5e06d05d54 Mon Sep 17 00:00:00 2001 From: f Date: Thu, 2 May 2024 16:25:20 -0300 Subject: [PATCH 07/11] chore: haml-lint --- app/views/sites/index.haml | 39 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/app/views/sites/index.haml b/app/views/sites/index.haml index 840efb76..1befa2d0 100644 --- a/app/views/sites/index.haml +++ b/app/views/sites/index.haml @@ -4,7 +4,7 @@ %p.lead= t('.help') - if policy(Site).new? = link_to t('sites.new.title'), new_site_path, - class: 'btn btn-secondary' + class: 'btn btn-secondary' %section.col - if @sites.empty? @@ -15,11 +15,14 @@ %tbody - @sites.each do |site| - next unless site.jekyll? + %tr %td %h2 - if policy(site).show? - = link_to site.title, site_posts_path(site, locale: site.default_locale) + = link_to site.title, + site_posts_path(site, + locale: site.default_locale) - else = site.title %p.lead= site.description @@ -27,27 +30,27 @@ = link_to t('.visit'), site.url, class: 'btn btn-secondary' - if current_usuarie.rol_for_site(site).temporal? = render 'components/btn_base', - text: t('sites.invitations.accept'), - path: site_usuaries_accept_invitation_path(site), - title: t('help.sites.invitations.accept'), - class: 'btn-secondary' + text: t('sites.invitations.accept'), + path: site_usuaries_accept_invitation_path(site), + title: t('help.sites.invitations.accept'), + class: 'btn-secondary' = render 'components/btn_base', - text: t('sites.invitations.reject'), - path: site_usuaries_reject_invitation_path(site), - title: t('help.sites.invitations.reject'), - class: 'btn-secondary' + text: t('sites.invitations.reject'), + path: site_usuaries_reject_invitation_path(site), + title: t('help.sites.invitations.reject'), + class: 'btn-secondary' - else - if policy(site).show? = render 'layouts/btn_with_tooltip', - tooltip: t('help.sites.edit_posts'), - type: 'success', - link: site_path(site), - text: t('sites.posts') + tooltip: t('help.sites.edit_posts'), + type: 'success', + link: site_path(site), + text: t('sites.posts') = render 'sites/build', site: site = render 'sites/moderation_queue', site: site - if policy(SiteUsuarie.new(site, current_usuarie)).index? = render 'layouts/btn_with_tooltip', - tooltip: t('usuaries.index.help.self'), - text: t('usuaries.index.title'), - type: 'info', - link: site_usuaries_path(site) + tooltip: t('usuaries.index.help.self'), + text: t('usuaries.index.title'), + type: 'info', + link: site_usuaries_path(site) From 08b07a51581ced69509e84eef95b4c91ce36e171 Mon Sep 17 00:00:00 2001 From: f Date: Fri, 3 May 2024 12:42:05 -0300 Subject: [PATCH 08/11] fix: permitir sitios sin layouts #14329 --- app/models/site.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/site.rb b/app/models/site.rb index d47a8e50..9c94c31b 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -289,6 +289,8 @@ class Site < ApplicationRecord # # @return [Hash] { post: Layout } def layouts + return {} if data['layouts'].blank? + # Crea un Struct dinámico cuyas llaves son los nombres de todos los # layouts. Si pasamos un layout que no existe, obtenemos un # NoMethodError From 186f979157723c0514d7ae7592d98958a2afb026 Mon Sep 17 00:00:00 2001 From: fauno Date: Sat, 18 May 2024 14:22:34 +0000 Subject: [PATCH 09/11] ci: test [skip ci] From e04640c8c6d794a7b30164747b0335c41c235007 Mon Sep 17 00:00:00 2001 From: fauno Date: Sat, 18 May 2024 14:24:14 +0000 Subject: [PATCH 10/11] ci: test [skip ci] From eef6ff58c88bec560d59d7d3b9bc3f497f859f54 Mon Sep 17 00:00:00 2001 From: fauno Date: Sat, 18 May 2024 14:32:08 +0000 Subject: [PATCH 11/11] ci: test [skip ci]