kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Project must have namespace for Project#find_with_namespace

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-03-14 15:58:10 +02:00
parent 17a9ecf8cf
commit 25f68a71d6
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/models/project.rb
View file

@ -177,15 +177,13 @@ class Project < ActiveRecord::Base
end end
def find_with_namespace(id) def find_with_namespace(id)
if id.include?("/") return nil unless id.include?("/")
id = id.split("/")
namespace = Namespace.find_by(path: id.first)
return nil unless namespace
where(namespace_id: namespace.id).find_by(path: id.second) id = id.split("/")
else namespace = Namespace.find_by(path: id.first)
where(path: id, namespace_id: nil).last return nil unless namespace
end
where(namespace_id: namespace.id).find_by(path: id.second)
end end
def visibility_levels def visibility_levels