diff --git a/app/models/user/role.rb b/app/models/user/role.rb index 3d2310a1f..6f3df1c9c 100644 --- a/app/models/user/role.rb +++ b/app/models/user/role.rb @@ -5,8 +5,7 @@ module User::Role enum :role, %i[ admin member system ].index_by(&:itself), scopes: false scope :member, -> { where(role: :member) } - scope :without_system, -> { where.not(role: :system) } - scope :active, -> { without_system.where(active: true) } + scope :active, -> { where(active: true).where.not(role: :system) } end class_methods do