Move case sensitivity check to find_with_namespace.
This commit is contained in:
parent
2f7fc7e9f7
commit
e17e5a5ce4
2 changed files with 4 additions and 11 deletions
|
@ -118,8 +118,7 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
project_path = "#{namespace}/#{id}"
|
||||
@project = Project.find_with_namespace(project_path) ||
|
||||
Project.find_with_namespace(project_path, case_sensitive: false)
|
||||
@project = Project.find_with_namespace(project_path)
|
||||
|
||||
if @project and can?(current_user, :read_project, @project)
|
||||
if @project.path_with_namespace != project_path
|
||||
|
|
|
@ -235,7 +235,7 @@ class Project < ActiveRecord::Base
|
|||
where('projects.archived = ?', false).where('LOWER(projects.name) LIKE :query', query: "%#{query.downcase}%")
|
||||
end
|
||||
|
||||
def find_with_namespace(id, case_sensitive: true)
|
||||
def find_with_namespace(id)
|
||||
namespace_path, project_path = id.split('/')
|
||||
|
||||
return nil if !namespace_path || !project_path
|
||||
|
@ -247,14 +247,8 @@ class Project < ActiveRecord::Base
|
|||
joins(:namespace).
|
||||
iwhere('namespaces.path' => namespace_path)
|
||||
|
||||
projects =
|
||||
if case_sensitive
|
||||
projects.where('projects.path' => project_path)
|
||||
else
|
||||
projects.iwhere('projects.path' => project_path)
|
||||
end
|
||||
|
||||
projects.take
|
||||
projects.where('projects.path' => project_path).take ||
|
||||
projects.iwhere('projects.path' => project_path).take
|
||||
end
|
||||
|
||||
def visibility_levels
|
||||
|
|
Loading…
Reference in a new issue