Admission-based registrations mode (#10250)

Fix #6856 Fix #6951
2019-03-14 05:28:30 +01:00 · 2019-03-14 05:28:30 +01:00 · 51e154f5e8
commit 51e154f5e8
parent 6e3936aa6f
92 changed files with 282 additions and 249 deletions
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@ -80,6 +80,10 @@ class Api::V1::AccountsController < Api::BaseController
  end

  def check_enabled_registrations
-    forbidden if single_user_mode? || !Setting.open_registrations
+    forbidden if single_user_mode? || !allowed_registrations?
+  end
+
+  def allowed_registrations?
+    Setting.registrations_mode != 'none'
  end
 end