forked from fedi/mastodon
Fix maxed-out invites not showing up as expired in UI (#10274)
This commit is contained in:
parent
1b167707c2
commit
ff565524aa
|
@ -10,10 +10,7 @@
|
||||||
= image_tag invite.user.account.avatar.url(:original), alt: '', width: 16, height: 16, class: 'avatar'
|
= image_tag invite.user.account.avatar.url(:original), alt: '', width: 16, height: 16, class: 'avatar'
|
||||||
%span.username= invite.user.account.username
|
%span.username= invite.user.account.username
|
||||||
|
|
||||||
- if invite.expired?
|
- if invite.valid_for_use?
|
||||||
%td{ colspan: 2 }
|
|
||||||
= t('invites.expired')
|
|
||||||
- else
|
|
||||||
%td
|
%td
|
||||||
= fa_icon 'user fw'
|
= fa_icon 'user fw'
|
||||||
= invite.uses
|
= invite.uses
|
||||||
|
@ -24,6 +21,10 @@
|
||||||
- else
|
- else
|
||||||
%time.formatted{ datetime: invite.expires_at.iso8601, title: l(invite.expires_at) }
|
%time.formatted{ datetime: invite.expires_at.iso8601, title: l(invite.expires_at) }
|
||||||
= l invite.expires_at
|
= l invite.expires_at
|
||||||
|
- else
|
||||||
|
%td{ colspan: 2 }
|
||||||
|
= t('invites.expired')
|
||||||
|
|
||||||
%td
|
%td
|
||||||
- if !invite.expired? && policy(invite).destroy?
|
- if invite.valid_for_use? && policy(invite).destroy?
|
||||||
= table_link_to 'times', t('invites.delete'), admin_invite_path(invite), method: :delete
|
= table_link_to 'times', t('invites.delete'), admin_invite_path(invite), method: :delete
|
||||||
|
|
|
@ -5,10 +5,7 @@
|
||||||
%input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: public_invite_url(invite_code: invite.code) }
|
%input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: public_invite_url(invite_code: invite.code) }
|
||||||
%button{ type: :button }= t('generic.copy')
|
%button{ type: :button }= t('generic.copy')
|
||||||
|
|
||||||
- if invite.expired?
|
- if invite.valid_for_use?
|
||||||
%td{ colspan: 2 }
|
|
||||||
= t('invites.expired')
|
|
||||||
- else
|
|
||||||
%td
|
%td
|
||||||
= fa_icon 'user fw'
|
= fa_icon 'user fw'
|
||||||
= invite.uses
|
= invite.uses
|
||||||
|
@ -19,7 +16,10 @@
|
||||||
- else
|
- else
|
||||||
%time.formatted{ datetime: invite.expires_at.iso8601, title: l(invite.expires_at) }
|
%time.formatted{ datetime: invite.expires_at.iso8601, title: l(invite.expires_at) }
|
||||||
= l invite.expires_at
|
= l invite.expires_at
|
||||||
|
- else
|
||||||
|
%td{ colspan: 2 }
|
||||||
|
= t('invites.expired')
|
||||||
|
|
||||||
%td
|
%td
|
||||||
- if !invite.expired? && policy(invite).destroy?
|
- if invite.valid_for_use? && policy(invite).destroy?
|
||||||
= table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete
|
= table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete
|
||||||
|
|
Loading…
Reference in a new issue