Skip to content
Snippets Groups Projects
Commit 419990eb authored by Adam Niedzielski's avatar Adam Niedzielski
Browse files

Remove scopes.

parent d0aa98bc
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -31,7 +31,6 @@ class Member < ActiveRecord::Base
scope :non_invite, -> { where(invite_token: nil) }
scope :request, -> { where.not(requested_at: nil) }
scope :has_access, -> { where('access_level > 0') }
scope :still_active, -> { where('expires_at IS NULL OR expires_at > ?', Time.current) }
 
scope :guests, -> { where(access_level: GUEST) }
scope :reporters, -> { where(access_level: REPORTER) }
Loading
Loading
@@ -55,7 +54,7 @@ class Member < ActiveRecord::Base
 
class << self
def access_for_user_ids(user_ids)
where(user_id: user_ids).has_access.still_active.pluck(:user_id, :access_level).to_h
where(user_id: user_ids).has_access.pluck(:user_id, :access_level).to_h
end
 
def find_by_invite_token(invite_token)
Loading
Loading
Loading
Loading
@@ -66,7 +66,7 @@ class User < ActiveRecord::Base
# Projects
has_many :groups_projects, through: :groups, source: :projects
has_many :personal_projects, through: :namespace, source: :projects
has_many :project_members, -> { where(requested_at: nil).still_active }, dependent: :destroy, class_name: 'ProjectMember'
has_many :project_members, -> { where(requested_at: nil) }, dependent: :destroy, class_name: 'ProjectMember'
has_many :projects, through: :project_members
has_many :created_projects, foreign_key: :creator_id, class_name: 'Project'
has_many :users_star_projects, dependent: :destroy
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment