floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' into dev_chain

This commit is contained in:
sylor_huang@126.com 2020-06-30 11:53:38 +08:00
parent 26dc737ee3 9c5431fd97
commit ec6e962248
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/repositories_controller.rb
View File

@ -28,7 +28,7 @@ class RepositoriesController < ApplicationController
@project.increment!(:visits) @project.increment!(:visits)
@project_owner = @project.owner @project_owner = @project.owner
@entries = Gitea::Repository::Entries::ListService.new(@project_owner, @project.identifier, ref: @ref).call @entries = Gitea::Repository::Entries::ListService.new(@project_owner, @project.identifier, ref: @ref).call
@entries = @entries["status"].to_i != -1 ? @entries.sort_by{ |hash| hash['type'] } : [] @entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
@path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/" @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
end end

3
app/services/gitea/repository/entries/list_service.rb
View File

@ -29,7 +29,8 @@ class Gitea::Repository::Entries::ListService < Gitea::ClientService
when 200 when 200
body body
else else
{'status': -1, 'message': "#{body['message']}"} Rails.logger.info("########__________has_error_______##########{body['message']}")
[]
end end
end end
end end