Merge pull request 'issue 删除当project 为0时不处理' (#210) from KingChan/forgeplus:pm_project_develop into pm_project_develop
This commit is contained in:
commit
e9318d38f9
|
@ -19,7 +19,7 @@ class Api::V1::Issues::BatchDeleteService < ApplicationService
|
||||||
|
|
||||||
project.incre_project_issue_cache_delete_count(@issues.size)
|
project.incre_project_issue_cache_delete_count(@issues.size)
|
||||||
|
|
||||||
if Site.has_notice_menu?
|
if Site.has_notice_menu? && !project.id.zero?
|
||||||
@issues.each do |issue|
|
@issues.each do |issue|
|
||||||
SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigners.pluck(:id), @issue.author_id)
|
SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigners.pluck(:id), @issue.author_id)
|
||||||
end
|
end
|
||||||
|
|
|
@ -19,11 +19,11 @@ class Api::V1::Issues::DeleteService < ApplicationService
|
||||||
|
|
||||||
project.incre_project_issue_cache_delete_count
|
project.incre_project_issue_cache_delete_count
|
||||||
|
|
||||||
if Site.has_blockchain? && @project.use_blockchain
|
if Site.has_blockchain? && @project.use_blockchain && !project.id.zero?
|
||||||
unlock_balance_on_blockchain(@issue.author_id.to_s, @project.id.to_s, @issue.blockchain_token_num.to_i) if @issue.blockchain_token_num.present?
|
unlock_balance_on_blockchain(@issue.author_id.to_s, @project.id.to_s, @issue.blockchain_token_num.to_i) if @issue.blockchain_token_num.present?
|
||||||
end
|
end
|
||||||
|
|
||||||
if Site.has_notice_menu?
|
if Site.has_notice_menu? && !project.id.zero?
|
||||||
SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigners.pluck(:id), @issue.author_id)
|
SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigners.pluck(:id), @issue.author_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue