mirror of
https://0xacab.org/sutty/sutty
synced 2024-11-26 14:46:21 +00:00
Merge branch 'rails' of 0xacab.org:sutty/sutty into issue-15068
This commit is contained in:
commit
a734b65a9e
4 changed files with 38 additions and 32 deletions
|
@ -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
|
||||
|
|
|
@ -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?
|
||||
|
|
|
@ -10,4 +10,6 @@
|
|||
-# 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
|
||||
|
||||
|
|
|
@ -15,15 +15,18 @@
|
|||
%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
|
||||
%br
|
||||
.d-flex.flex-row
|
||||
= link_to t('.visit'), site.url, class: 'btn btn-secondary'
|
||||
- if current_usuarie.rol_for_site(site).temporal?
|
||||
= render 'components/btn_base',
|
||||
|
|
Loading…
Reference in a new issue