attr_accessible :name, :path, :description, :default_branch, :issues_tracker,
:issues_enabled, :wall_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id,
- :wiki_enabled, :public, :import_url, as: [:default, :admin]
+ :wiki_enabled, :public, :import_url, :last_activity_at, as: [:default, :admin]
attr_accessible :namespace_id, :creator_id, as: :admin
validate :check_limit, :repo_name
# Scopes
- scope :without_user, ->(user) { where("id NOT IN (:ids)", ids: user.authorized_projects.map(&:id) ) }
- scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) }
- scope :without_team, ->(team) { team.projects.present? ? where("id NOT IN (:ids)", ids: team.projects.map(&:id)) : scoped }
- scope :in_team, ->(team) { where("id IN (:ids)", ids: team.projects.map(&:id)) }
+ scope :without_user, ->(user) { where("projects.id NOT IN (:ids)", ids: user.authorized_projects.map(&:id) ) }
+ scope :without_team, ->(team) { team.projects.present? ? where("projects.id NOT IN (:ids)", ids: team.projects.map(&:id)) : scoped }
+ scope :not_in_group, ->(group) { where("projects.id NOT IN (:ids)", ids: group.project_ids ) }
+ scope :in_team, ->(team) { where("projects.id IN (:ids)", ids: team.projects.map(&:id)) }
scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) }
- scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
+ scope :in_group_namespace, -> { joins(:group) }
+ scope :sorted_by_activity, -> { order("projects.last_activity_at DESC") }
scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
scope :public_only, -> { where(public: true) }
- enumerize :issues_tracker, :in => (Gitlab.config.issues_tracker.keys).append(:gitlab), :default => :gitlab
+ enumerize :issues_tracker, in: (Gitlab.config.issues_tracker.keys).append(:gitlab), default: :gitlab
class << self
def abandoned
end
def last_activity_date
- last_event.try(:created_at) || updated_at
+ last_activity_at || updated_at
end
def project_id
#
# Namespace for personal projects
- has_one :namespace,
- dependent: :destroy,
- foreign_key: :owner_id,
- class_name: "Namespace",
- conditions: 'type IS NULL'
+ has_one :namespace, dependent: :destroy, foreign_key: :owner_id, class_name: "Namespace", conditions: 'type IS NULL'
+
+ # Namespaces (owned groups and own namespace)
+ has_many :namespaces, foreign_key: :owner_id
# Profile
has_many :keys, dependent: :destroy
has_many :groups, class_name: "Group", foreign_key: :owner_id
# Teams
- has_many :own_teams,
- class_name: "UserTeam",
- foreign_key: :owner_id,
- dependent: :destroy
-
- has_many :user_team_user_relationships, dependent: :destroy
- has_many :user_teams, through: :user_team_user_relationships
+ has_many :own_teams, dependent: :destroy, class_name: "UserTeam", foreign_key: :owner_id
+ has_many :user_team_user_relationships, dependent: :destroy
+ has_many :user_teams, through: :user_team_user_relationships
has_many :user_team_project_relationships, through: :user_teams
- has_many :team_projects, through: :user_team_project_relationships
+ has_many :team_projects, through: :user_team_project_relationships
# Projects
has_many :users_projects, dependent: :destroy
has_many :notes, dependent: :destroy, foreign_key: :author_id
has_many :merge_requests, dependent: :destroy, foreign_key: :author_id
has_many :events, dependent: :destroy, foreign_key: :author_id, class_name: "Event"
+ has_many :recent_events, foreign_key: :author_id, class_name: "Event", order: "id DESC"
has_many :assigned_issues, dependent: :destroy, foreign_key: :assignee_id, class_name: "Issue"
has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest"
- has_many :projects, through: :users_projects
- has_many :recent_events,
- class_name: "Event",
- foreign_key: :author_id,
- order: "id DESC"
+ has_many :personal_projects, through: :namespace, source: :projects
+ has_many :projects, through: :users_projects
+ has_many :own_projects, foreign_key: :creator_id
+ has_many :owned_projects, through: :namespaces, source: :projects
#
# Validations
format: { with: Gitlab::Regex.username_regex,
message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
- validates :notification_level,
- inclusion: { in: Notification.notification_levels },
- presence: true
+ validates :notification_level, inclusion: { in: Notification.notification_levels }, presence: true
validate :namespace_uniq, if: ->(user) { user.username_changed? }
scope :alphabetically, -> { order('name ASC') }
scope :in_team, ->(team){ where(id: team.member_ids) }
scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) }
+ scope :not_in_project, ->(project) { project.users.present? ? where("id not in (:ids)", ids: project.users.map(&:id) ) : scoped }
+ scope :without_projects, -> { where('id NOT IN (SELECT DISTINCT(user_id) FROM users_projects)') }
+
scope :potential_team_members, ->(team) { team.members.any? ? active.not_in_team(team) : active }
#
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
-
def create_from_omniauth(auth, ldap = false)
gitlab_auth.create_from_omniauth(auth, ldap)
end
end
end
- # Namespaces user has access to
- def namespaces
- namespaces = []
-
- # Add user account namespace
- namespaces << self.namespace if self.namespace
-
- # Add groups you can manage
- namespaces += groups.all
-
- namespaces
- end
-
# Groups where user is an owner
def owned_groups
groups
end
+ def owned_teams
+ own_teams
+ end
+
# Groups user has access to
def authorized_groups
- @authorized_groups ||= begin
- groups = Group.where(id: self.authorized_projects.pluck(:namespace_id)).all
- groups = groups + self.groups
- groups.uniq
- end
+ @group_ids ||= (groups.pluck(:id) + authorized_projects.pluck(:namespace_id))
+ Group.where(id: @group_ids)
end
# Projects user has access to
def authorized_projects
- project_ids = users_projects.pluck(:project_id)
- project_ids = project_ids | owned_projects.pluck(:id)
- Project.where(id: project_ids)
+ @project_ids ||= (owned_projects.pluck(:id) + projects.pluck(:id)).uniq
+ Project.where(id: @project_ids)
end
- # Projects in user namespace
- def personal_projects
- Project.personal(self)
- end
-
- # Projects where user is an owner
- def owned_projects
- Project.where("(projects.namespace_id IN (:namespaces)) OR
- (projects.namespace_id IS NULL AND projects.creator_id = :user_id)",
- namespaces: namespaces.map(&:id), user_id: self.id)
+ def authorized_teams
+ @team_ids ||= (user_teams.pluck(:id) + own_teams.pluck(:id)).uniq
+ UserTeam.where(id: @team_ids)
end
# Team membership in authorized projects
def tm_in_authorized_projects
- UsersProject.where(project_id: authorized_projects.map(&:id), user_id: self.id)
+ UsersProject.where(project_id: authorized_projects.map(&:id), user_id: self.id)
end
def is_admin?
end
def several_namespaces?
- namespaces.size > 1
+ namespaces.many?
end
def namespace_id
namespace.try :id
end
- def authorized_teams
- @authorized_teams ||= begin
- ids = []
- ids << UserTeam.with_member(self).pluck('user_teams.id')
- ids << UserTeam.created_by(self).pluck('user_teams.id')
- ids.flatten
-
- UserTeam.where(id: ids)
- end
- end
-
- def owned_teams
- UserTeam.where(owner_id: self.id)
- end
-
def name_with_username
"#{name} (#{username})"
end
OSDN Git Service
