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/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@ -21,6 +21,14 @@ class UserPolicy < ApplicationPolicy
    staff?
  end

+  def approve?
+    staff? && !record.approved?
+  end
+
+  def reject?
+    staff? && !record.approved?
+  end
+
  def disable?
    staff? && !record.admin?
  end
@ -36,7 +44,7 @@ class UserPolicy < ApplicationPolicy
  private

  def promoteable?
-    !record.staff? || !record.admin?
+    record.approved? && (!record.staff? || !record.admin?)
  end

  def demoteable?