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

Fixed user.namespace_id exception if namespace is nil

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-25 12:26:34 +02:00
parent c31d48dd25
commit 97a92f8ae7
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/admin/projects_controller.rb
View file

@ -47,9 +47,8 @@ class Admin::ProjectsController < AdminController
def project def project
id = params[:project_id] || params[:id] id = params[:project_id] || params[:id]
id = id.split("/") if id.include?("/")
@project ||= Project.find_by_path(id) @project = Project.find_with_namespace(id)
@project || render_404 @project || render_404
end end
end end

1
app/models/user.rb
View file

@ -72,7 +72,6 @@ class User < ActiveRecord::Base
alias_attribute :private_token, :authentication_token alias_attribute :private_token, :authentication_token
delegate :path, 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 # Scopes
scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) } scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) }