* Change: #621 登録時間帯制限で、制限時間中は登録を禁止ではなく承認制にする * 管理画面のUIを改善 * Fix test * Fix lint
This commit is contained in:
parent
4119b8713e
commit
941705be62
13 changed files with 52 additions and 33 deletions
|
@ -111,7 +111,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
|||
def registrations
|
||||
{
|
||||
enabled: registrations_enabled?,
|
||||
approval_required: Setting.registrations_mode == 'approved',
|
||||
approval_required: Setting.registrations_mode == 'approved' || (Setting.registrations_mode == 'open' && !registrations_in_time?),
|
||||
limit_reached: Setting.registrations_mode != 'none' && reach_registrations_limit?,
|
||||
message: registrations_enabled? ? nil : registrations_message,
|
||||
url: ENV.fetch('SSO_ACCOUNT_SIGN_UP', nil),
|
||||
|
|
|
@ -115,7 +115,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
|
|||
end
|
||||
|
||||
def approval_required
|
||||
Setting.registrations_mode == 'approved'
|
||||
Setting.registrations_mode == 'approved' || (Setting.registrations_mode == 'open' && !registrations_in_time?)
|
||||
end
|
||||
|
||||
def invites_enabled
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue