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' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

This commit is contained in:
Jasder 2020-06-05 18:02:28 +08:00
parent fabd7b3c6f e38f00b330
commit 883ff8f768
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/issues_controller.rb
View File

@ -336,8 +336,14 @@ class IssuesController < ApplicationController
} }
ChangeTokenJob.perform_later(change_params) ChangeTokenJob.perform_later(change_params)
end end
if @issue.issue_classify.to_s == "pull_request"
@issue&.pull_request&.update_attribute(:status, 2)
end
else else
@issue&.project_trends&.update_all(action_type: "create") @issue&.project_trends&.update_all(action_type: "create")
if @issue.issue_classify.to_s == "pull_request"
@issue&.pull_request&.update_attribute(:status, 0)
end
end end
if @issue.issue_classify == "issue" if @issue.issue_classify == "issue"
close_message = "close_issue" close_message = "close_issue"

5
app/helpers/repositories_helper.rb
View File

@ -9,6 +9,11 @@ module RepositoriesHelper
default_type.include?(str&.downcase) default_type.include?(str&.downcase)
end end
def image_type?(str)
default_type = %w(png jpg gif tif psd svg)
default_type.include?(str&.downcase)
end
def render_commit_author(author_json) def render_commit_author(author_json)
return nil if author_json.blank? return nil if author_json.blank?
find_user_by_login author_json['login'] find_user_by_login author_json['login']

3
app/services/gitea/client_service.rb
View File

@ -21,6 +21,9 @@ class Gitea::ClientService < ApplicationService
def post(url, params={}) def post(url, params={})
puts "[gitea] request params: #{params}" puts "[gitea] request params: #{params}"
request_url = [api_url, url].join('').freeze request_url = [api_url, url].join('').freeze
Rails.logger.info("######_____api____request_url_______###############{request_url}")
Rails.logger.info("######_____api____request_params_______###############{params}")
auth_token = authen_params(params[:token]) auth_token = authen_params(params[:token])
response = conn(auth_token).post do |req| response = conn(auth_token).post do |req|
req.url "#{request_url}" req.url "#{request_url}"

2
app/views/repositories/_simple_entry.json.jbuilder
View File

@ -1,6 +1,7 @@
file_name = entry['name'] file_name = entry['name']
file_type = file_name.to_s.split(".").last file_type = file_name.to_s.split(".").last
direct_download = download_type(file_type) direct_download = download_type(file_type)
image_type = image_type?(file_type)
json.name file_name json.name file_name
json.sha entry['sha'] json.sha entry['sha']
json.path entry['path'] json.path entry['path']
@ -10,6 +11,7 @@ json.content entry['content'].present? && !direct_download ? render_decode64_con
json.target entry['target'] json.target entry['target']
json.download_url entry['download_url'] json.download_url entry['download_url']
json.direct_download direct_download json.direct_download direct_download
json.image_type image_type
if entry['latest_commit'] if entry['latest_commit']
json.partial! 'last_commit', entry: entry json.partial! 'last_commit', entry: entry