Merge pull request #982 from jd-erreape/add_scopes_to_roleable

Added role scopes to roleable

app/models/user.rb

@@ -61,9 +61,6 @@ class User < ActiveRecord::Base
   # This is just used to pass some information into the serializer
   attr_accessor :notification_channel_position
 
-  scope :admins, -> { where(admin: true) }
-  scope :moderators, -> { where(moderator: true) }
-  scope :staff, -> { where("moderator or admin ") }
   scope :blocked, -> { where(blocked: true) } # no index
 
   module NewTopicDuration

lib/roleable.rb

@@ -3,6 +3,12 @@ require 'active_support/concern'
 module Roleable
   extend ActiveSupport::Concern
 
+  included do
+    scope :admins, -> { where(admin: true) }
+    scope :moderators, -> { where(moderator: true) }
+    scope :staff, -> { where("moderator or admin ") }
+  end
+
   # any user that is either a moderator or an admin
   def staff?
     admin || moderator