mirror of
https://0xacab.org/sutty/sutty
synced 2024-11-23 01:06:22 +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 }
|
# @return [Hash] { post: Layout }
|
||||||
def layouts
|
def layouts
|
||||||
|
return {} if data['layouts'].blank?
|
||||||
|
|
||||||
# Crea un Struct dinámico cuyas llaves son los nombres de todos los
|
# Crea un Struct dinámico cuyas llaves son los nombres de todos los
|
||||||
# layouts. Si pasamos un layout que no existe, obtenemos un
|
# layouts. Si pasamos un layout que no existe, obtenemos un
|
||||||
# NoMethodError
|
# NoMethodError
|
||||||
|
|
|
@ -36,8 +36,7 @@ class SiteUsuariePolicy
|
||||||
end
|
end
|
||||||
|
|
||||||
def accept_invitation?
|
def accept_invitation?
|
||||||
su = site_usuarie
|
!!site_usuarie.usuarie.rol_for_site(site_usuarie.site)&.temporal
|
||||||
(usuarie? || invitade?) && su.usuarie.rol_for_site(su.site).temporal
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def reject_invitation?
|
def reject_invitation?
|
||||||
|
|
|
@ -10,4 +10,6 @@
|
||||||
-# XXX: Solo un nivel de recursividad
|
-# XXX: Solo un nivel de recursividad
|
||||||
- unless local_assigns[:parent_schema]
|
- unless local_assigns[:parent_schema]
|
||||||
- schema.schemas.each do |s|
|
- 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
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
%p.lead= t('.help')
|
%p.lead= t('.help')
|
||||||
- if policy(Site).new?
|
- if policy(Site).new?
|
||||||
= link_to t('sites.new.title'), new_site_path,
|
= link_to t('sites.new.title'), new_site_path,
|
||||||
class: 'btn btn-secondary'
|
class: 'btn btn-secondary'
|
||||||
|
|
||||||
%section.col
|
%section.col
|
||||||
- if @sites.empty?
|
- if @sites.empty?
|
||||||
|
@ -15,39 +15,42 @@
|
||||||
%tbody
|
%tbody
|
||||||
- @sites.each do |site|
|
- @sites.each do |site|
|
||||||
- next unless site.jekyll?
|
- next unless site.jekyll?
|
||||||
|
|
||||||
%tr
|
%tr
|
||||||
%td
|
%td
|
||||||
%h2
|
%h2
|
||||||
- if policy(site).show?
|
- 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
|
- else
|
||||||
= site.title
|
= site.title
|
||||||
%p.lead= site.description
|
%p.lead= site.description
|
||||||
%br
|
.d-flex.flex-row
|
||||||
= link_to t('.visit'), site.url, class: 'btn btn-secondary'
|
= link_to t('.visit'), site.url, class: 'btn btn-secondary'
|
||||||
- if current_usuarie.rol_for_site(site).temporal?
|
- if current_usuarie.rol_for_site(site).temporal?
|
||||||
= render 'components/btn_base',
|
= render 'components/btn_base',
|
||||||
text: t('sites.invitations.accept'),
|
text: t('sites.invitations.accept'),
|
||||||
path: site_usuaries_accept_invitation_path(site),
|
path: site_usuaries_accept_invitation_path(site),
|
||||||
title: t('help.sites.invitations.accept'),
|
title: t('help.sites.invitations.accept'),
|
||||||
class: 'btn-secondary'
|
class: 'btn-secondary'
|
||||||
= render 'components/btn_base',
|
= render 'components/btn_base',
|
||||||
text: t('sites.invitations.reject'),
|
text: t('sites.invitations.reject'),
|
||||||
path: site_usuaries_reject_invitation_path(site),
|
path: site_usuaries_reject_invitation_path(site),
|
||||||
title: t('help.sites.invitations.reject'),
|
title: t('help.sites.invitations.reject'),
|
||||||
class: 'btn-secondary'
|
class: 'btn-secondary'
|
||||||
- else
|
- else
|
||||||
- if policy(site).show?
|
- if policy(site).show?
|
||||||
= render 'layouts/btn_with_tooltip',
|
= render 'layouts/btn_with_tooltip',
|
||||||
tooltip: t('help.sites.edit_posts'),
|
tooltip: t('help.sites.edit_posts'),
|
||||||
type: 'success',
|
type: 'success',
|
||||||
link: site_path(site),
|
link: site_path(site),
|
||||||
text: t('sites.posts')
|
text: t('sites.posts')
|
||||||
= render 'sites/build', site: site
|
= render 'sites/build', site: site
|
||||||
= render 'sites/moderation_queue', site: site
|
= render 'sites/moderation_queue', site: site
|
||||||
- if policy(SiteUsuarie.new(site, current_usuarie)).index?
|
- if policy(SiteUsuarie.new(site, current_usuarie)).index?
|
||||||
= render 'layouts/btn_with_tooltip',
|
= render 'layouts/btn_with_tooltip',
|
||||||
tooltip: t('usuaries.index.help.self'),
|
tooltip: t('usuaries.index.help.self'),
|
||||||
text: t('usuaries.index.title'),
|
text: t('usuaries.index.title'),
|
||||||
type: 'info',
|
type: 'info',
|
||||||
link: site_usuaries_path(site)
|
link: site_usuaries_path(site)
|
||||||
|
|
Loading…
Reference in a new issue