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

added NamespacedProject role. Extended project info displayed for admin. Fixed project limit

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-14 08:14:05 +03:00
parent 44209861e8
commit b01f8b63c2
18 changed files with 201 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/models/user.rb
View file

@ -56,7 +56,6 @@ class User < ActiveRecord::Base
has_many :issues, foreign_key: :author_id, dependent: :destroy
has_many :notes, foreign_key: :author_id, dependent: :destroy
has_many :merge_requests, foreign_key: :author_id, dependent: :destroy
has_many :my_own_projects, class_name: "Project", foreign_key: :owner_id
has_many :events, class_name: "Event", foreign_key: :author_id, dependent: :destroy
has_many :recent_events, class_name: "Event", foreign_key: :author_id, order: "id DESC"
has_many :assigned_issues, class_name: "Issue", foreign_key: :assignee_id, dependent: :destroy
@ -124,16 +123,4 @@ class User < ActiveRecord::Base
self.password = self.password_confirmation = Devise.friendly_token.first(8)
end
end
def authorized_groups
@authorized_groups ||= begin
groups = Group.where(id: self.projects.pluck(:namespace_id)).all
groups = groups + self.groups
groups.uniq
end
end
def authorized_projects
Project.authorized_for(self)
end
end