diff --git a/app/controllers/issue_times_controller.rb b/app/controllers/issue_times_controller.rb index 7b6dadfe7..1ddc66d9e 100644 --- a/app/controllers/issue_times_controller.rb +++ b/app/controllers/issue_times_controller.rb @@ -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, "操作失败") diff --git a/app/views/projects/_project_item.json.jbuilder b/app/views/projects/_project_item.json.jbuilder new file mode 100644 index 000000000..c8093b7aa --- /dev/null +++ b/app/views/projects/_project_item.json.jbuilder @@ -0,0 +1,25 @@ +user = project.owner +if user.present? + json.partial! '/projects/project', project: project + json.author do + json.name user.try(:show_real_name) + json.login user.login + json.image_url url_to_avatar(project.owner) + end + json.category do + if project.project_category.blank? + json.nil! + else + json.id project.project_category.id + json.name project.project_category.name + end + end + json.language do + if project.project_language.blank? + json.nil! + else + json.id project.project_language.id + json.name project.project_language.name + end + end +end \ No newline at end of file