floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-20 03:35:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

项目列表页的搜索修改

Browse Source
This commit is contained in:
sylor_huang@126.com
2020-05-09 15:29:47 +08:00
parent e0423b9cc8
commit 8faaf7ac3a
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/issue_times_controller.rb
View File

@@ -22,16 +22,10 @@ class IssueTimesController < ApplicationController
end_type = params[:end_type].to_i
end_work_time = end_type == 0 ? "" : Time.now
last_work_time = @issue.issue_times.where(user_id: current_user.id, end_time: nil)
Rails.logger.info("######________last_work_time&.last.try(:id)_____###########{last_work_time&.first.try(:id)}")
if last_work_time.update_all(end_time: end_work_time)
if end_type == 0
message = "取消时间跟踪"
@issue.custom_journal_detail("cancel_time",last_work_time&.first.try(:id), "取消时间跟踪", current_user&.id)
else
message = "停止工作"
@issue.custom_journal_detail("end_time",last_work_time&.first.try(:id), "停止工作", current_user&.id)
end
message = end_type == 0 ? "取消时间跟踪" : "停止工作"
journal_time = end_type == 0 ? "cancel_time" : "end_time"
@issue.custom_journal_detail(journal_time,last_work_time&.first.try(:id), message, current_user&.id)
normal_status(0, message)
else
normal_status(0, "操作失败")