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

SQL Fixes

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-10-03 14:26:37 +03:00
parent 8b76e30656
commit ce1b79afa9
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/groups_controller.rb
View file

@ -50,7 +50,7 @@ class GroupsController < ApplicationController
end
def people
@users = group.projects.map(&:users).flatten.uniq
@users = group.users
end
protected

6
app/models/group.rb
View file

@ -23,10 +23,14 @@ class Group < ActiveRecord::Base
delegate :name, to: :owner, allow_nil: true, prefix: true
def self.search query
where("name like :query or code like :query", query: "%#{query}%")
where("name like :query OR code like :query", query: "%#{query}%")
end
def to_param
code
end
def users
User.joins(:users_projects).where('users_projects.project_id' => project_ids).uniq
end
end

6
app/models/project.rb
View file

@ -30,15 +30,15 @@ class Project < ActiveRecord::Base
# Scopes
scope :public_only, where(private_flag: false)
scope :without_user, ->(user) { where("id not in (:ids)", ids: user.projects.map(&:id) ) }
scope :not_in_group, ->(group) { where("id not in (:ids)", ids: group.project_ids ) }
scope :without_user, ->(user) { where("id NOT IN (:ids)", ids: user.projects.map(&:id) ) }
scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) }
def self.active
joins(:issues, :notes, :merge_requests).order("issues.created_at, notes.created_at, merge_requests.created_at DESC")
end
def self.search query
where("name like :query or code like :query or path like :query", query: "%#{query}%")
where("name like :query OR code like :query OR path like :query", query: "%#{query}%")
end
def self.create_by_user(params, user)