Download as
Browse Code »

Commit 97a92f8ae78a186aa76fcc860b570cf07c90c048

Authored by Dmitriy Zaporozhets
1 parent c31d48dd
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed user.namespace_id exception if namespace is nil

Showing 2 changed files with 1 additions and 3 deletions   Show diff stats
app/controllers/admin/projects_controller.rb
  Diff comments   View file @97a92f8
@@ -47,9 +47,8 @@ class Admin::ProjectsController < AdminController @@ -47,9 +47,8 @@ class Admin::ProjectsController < AdminController
47 47
48 def project 48 def project
49 id = params[:project_id] || params[:id] 49 id = params[:project_id] || params[:id]
50 - id = id.split("/") if id.include?("/")  
51 50
52 - @project ||= Project.find_by_path(id) 51 + @project = Project.find_with_namespace(id)
53 @project || render_404 52 @project || render_404
54 end 53 end
55 end 54 end
app/models/user.rb
  Diff comments   View file @97a92f8
@@ -72,7 +72,6 @@ class User < ActiveRecord::Base @@ -72,7 +72,6 @@ class User < ActiveRecord::Base
72 alias_attribute :private_token, :authentication_token 72 alias_attribute :private_token, :authentication_token
73 73
74 delegate :path, to: :namespace, allow_nil: true, prefix: true 74 delegate :path, to: :namespace, allow_nil: true, prefix: true
75 - delegate :id, to: :namespace, allow_nil: true, prefix: true  
76 75
77 # Scopes 76 # Scopes
78 scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) } 77 scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) }