From 4c1bcd87a21922f8fa892f067031ca7eeec1e0d8 Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Sat, 6 May 2023 14:42:11 +0800 Subject: [PATCH 1/2] add repositories replace_file json --- app/views/repositories/replace_file.json.jbuilder | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/views/repositories/replace_file.json.jbuilder diff --git a/app/views/repositories/replace_file.json.jbuilder b/app/views/repositories/replace_file.json.jbuilder new file mode 100644 index 000000000..5687ee731 --- /dev/null +++ b/app/views/repositories/replace_file.json.jbuilder @@ -0,0 +1,11 @@ +json.name @file['content']['name'] +json.sha @file['content']['sha'] +json.size @file['content']['size'] +json.content @file['content']['content'] +json.encoding @file['content']['encoding'] +json.pr_id @pull_issue.try(:id) +json.commit do + json.message @file['commit']['message'] + json.author @file['commit']['author'] + json.committer @file['commit']['committer'] +end From b86ea02dc9b7f8d97df9b2069c97b4bfd60e85a6 Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Sat, 6 May 2023 15:00:06 +0800 Subject: [PATCH 2/2] change response for replace file --- app/controllers/repositories_controller.rb | 1 + app/views/repositories/replace_file.json.jbuilder | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 app/views/repositories/replace_file.json.jbuilder diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index f729ab394..66b30eef8 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -219,6 +219,7 @@ class RepositoriesController < ApplicationController interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params) if interactor.success? @file = interactor.result + render_result(0, "替换成功") else render_error(interactor.error) end diff --git a/app/views/repositories/replace_file.json.jbuilder b/app/views/repositories/replace_file.json.jbuilder deleted file mode 100644 index 5687ee731..000000000 --- a/app/views/repositories/replace_file.json.jbuilder +++ /dev/null @@ -1,11 +0,0 @@ -json.name @file['content']['name'] -json.sha @file['content']['sha'] -json.size @file['content']['size'] -json.content @file['content']['content'] -json.encoding @file['content']['encoding'] -json.pr_id @pull_issue.try(:id) -json.commit do - json.message @file['commit']['message'] - json.author @file['commit']['author'] - json.committer @file['commit']['committer'] -end