class User < ActiveRecord::Base
  include Roles::Authorization
  devise :omniauthable,:omniauth_providers => [:nyulibraries]
  has_many :reservations, :dependent => :destroy

  scope :non_admin, -> { where("admin_roles_mask = 0") }
  scope :admin, -> { where("admin_roles_mask > 0") }
  scope :inactive, -> { where("last_login_at IS NULL OR last_login_at < ?", 1.year.ago) }

  acts_as_indexed :fields => [:firstname, :lastname, :username, :email]

  before_save :set_static_admins

  ##
  # Create a CSV format with comma DSL
  #
  # = Example
  #
  # format.csv { render :csv }
  comma do
    username
    firstname
    lastname
    email
  end

private

  def set_static_admins
    if Figs.env.rooms_default_admins.include? username
      self.admin_roles = ["superuser", self.admin_roles].flatten.uniq
    end
  end

end

class User < ActiveRecord::Base
  include Roles::Authorization
  devise :omniauthable,:omniauth_providers => [:nyulibraries]
  has_many :reservations, :dependent => :destroy

  scope :non_admin, -> { where("admin_roles_mask IS NULL OR admin_roles_mask = 0") }
  scope :admin, -> { where("admin_roles_mask > 0") }
  scope :inactive, -> { where("last_login_at IS NULL OR last_login_at < ?", 1.year.ago) }

  acts_as_indexed :fields => [:firstname, :lastname, :username, :email]

  before_save :set_static_admins

  ##
  # Create a CSV format with comma DSL
  #
  # = Example
  #
  # format.csv { render :csv }
  comma do
    username
    firstname
    lastname
    email
  end

private

  def set_static_admins
    if Figs.env.rooms_default_admins.include? username
      self.admin_roles = ["superuser", self.admin_roles].flatten.uniq
    end
  end

end

Change non_admin scope to include null value in admin_roles_mask
Change non_admin scope to include null value in admin_roles_mask
