Browse Source

更改:查询项目排除.json

pull/343/head
yystopf 3 years ago
parent
commit
eabf404682
1 changed files with 7 additions and 1 deletions
  1. +7
    -1
      app/models/project.rb

+ 7
- 1
app/models/project.rb View File

@@ -380,7 +380,13 @@ class Project < ApplicationRecord


user = Owner.find_by_login namespace_path user = Owner.find_by_login namespace_path
user = User.new(login: namespace_path) if user.nil? user = User.new(login: namespace_path) if user.nil?
project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
if identifier.end_with?('.json')
project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
identifier = identifier.sub(/.*\K.json/, '')
project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
else
project = user&.projects&.find_by(identifier: identifier) || Project.find_by(identifier: "#{namespace_path}/#{identifier}")
end
return nil if project.blank? return nil if project.blank?


[project, user] [project, user]


Loading…
Cancel
Save