deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix not_in_project scope. Added counters in admin -> users. Improved seeds

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-27 06:14:05 +03:00
parent e56a47ab19
commit 4cbb29cfad
13 changed files with 103 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/models/user.rb
View file

@ -77,7 +77,6 @@ class User < ActiveRecord::Base
delegate :path, to: :namespace, allow_nil: true, prefix: true
# Scopes
scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) }
scope :admins, where(admin: true)
scope :blocked, where(blocked: true)
scope :active, where(blocked: false)
@ -93,6 +92,14 @@ class User < ActiveRecord::Base
end
end
def not_in_project(project)
if project.users.present?
where("id not in (:ids)", ids: project.users.map(&:id) )
else
scoped
end
end
def without_projects
where('id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)')
end