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

Deprecate code for Project. Use title and path

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-23 21:11:09 +03:00
parent ab9d023651
commit c50ec72b52
22 changed files with 79 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/user.rb
View file

@ -69,7 +69,8 @@ class User < ActiveRecord::Base
before_save :ensure_authentication_token
alias_attribute :private_token, :authentication_token
delegate :code, to: :namespace, allow_nil: true, prefix: true
delegate :path, to: :namespace, allow_nil: true, prefix: true
delegate :id, to: :namespace, allow_nil: true, prefix: true
# Scopes
scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) }
@ -121,7 +122,7 @@ class User < ActiveRecord::Base
def namespaces
namespaces = []
namespaces << self.namespace
namespaces << self.namespace if self.namespace
namespaces = namespaces + Group.all if admin
namespaces
end