Skip to content
Snippets Groups Projects
Commit ce1b79af authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

SQL Fixes

parent 8b76e306
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -50,7 +50,7 @@ class GroupsController < ApplicationController
end
 
def people
@users = group.projects.map(&:users).flatten.uniq
@users = group.users
end
 
protected
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
@@ -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)
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