From a8e53d4e5cdf4ed1e1255f9c55ef040f23f3a934 Mon Sep 17 00:00:00 2001 From: jasder Date: Fri, 21 May 2021 18:51:46 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20[code=20bug]=E4=B8=B4=E6=97=B6=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=8E=B7=E5=8F=96readme=E6=96=87=E4=BB=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- app/views/repositories/entries.json.jbuilder | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 8019e905d..cf4c2132e 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -56,7 +56,7 @@ class RepositoriesController < ApplicationController # TODO # 临时处理readme文件问题 - admin = User.where(admin: true).last + admin = User.find_by_login "jasder" result = Gitea::Repository::Readme::GetService.call(@owner.login, @project.identifier, @ref, admin&.gitea_token) @readme = if result[:status] == :success diff --git a/app/views/repositories/entries.json.jbuilder b/app/views/repositories/entries.json.jbuilder index e62930a95..a12c088b0 100644 --- a/app/views/repositories/entries.json.jbuilder +++ b/app/views/repositories/entries.json.jbuilder @@ -59,5 +59,6 @@ if @project.forge? end end end - json.readme @readme[:readme].merge(content: readme_render_decode64_content(@result[:readme]["content"], nil)) + + json.readme @readme.merge(content: readme_render_decode64_content(@readme["content"], nil)) end