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-08-06 14:29:48 +08:00
parent c63c916d9d 97f40f6d76
commit 25a3c8a372
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/issues_controller.rb
View File

@ -248,7 +248,19 @@ class IssuesController < ApplicationController
update_hash = {} update_hash = {}
update_hash.merge!(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present? update_hash.merge!(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present?
update_hash.merge!(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present? update_hash.merge!(fixed_version_id: params[:fixed_version_id]) if params[:fixed_version_id].present?
update_hash.merge!(status_id: params[:status_id]) if params[:status_id].present? # update_hash.merge!(status_id: params[:status_id]) if params[:status_id].present?
if params[:status_id].present?
status_id = params[:status_id].to_i
update_hash.merge!(status_id: status_id)
done_ratio = nil
case status_id
when 1
done_ratio = 0
when 3
done_ratio = 100
end
update_hash.merge!(done_ratio: done_ratio) if done_ratio
end
# update_hash = params[:issue] # update_hash = params[:issue]
issue_ids = params[:ids] issue_ids = params[:ids]
if issue_ids.present? if issue_ids.present?

1
app/jobs/sync_repository_job.rb
View File

@ -28,6 +28,7 @@ class SyncRepositoryJob < ApplicationJob
SyncLog.sync_log("=============force_push_erros==#{path}/#{image_repo_name}++branch:#{branch}") SyncLog.sync_log("=============force_push_erros==#{path}/#{image_repo_name}++branch:#{branch}")
else else
SyncLog.sync_log("=============force_push_success==#{path}/#{image_repo_name}++branch+++#{branch}") SyncLog.sync_log("=============force_push_success==#{path}/#{image_repo_name}++branch+++#{branch}")
system("rm -rf #{path}/#{image_repo_name}")
end end
end end
else else