diff --git a/app/views/api/v1/projects/webhooks/hooktasks.json.jbuilder b/app/views/api/v1/projects/webhooks/hooktasks.json.jbuilder index 618a05515..22070cc68 100644 --- a/app/views/api/v1/projects/webhooks/hooktasks.json.jbuilder +++ b/app/views/api/v1/projects/webhooks/hooktasks.json.jbuilder @@ -1,6 +1,6 @@ json.total_count @hooktasks.total_count json.hooktasks @hooktasks.each do |task| json.(task, :id, :event_type, :type, :uuid, :is_succeed, :is_delivered, :payload_content, :request_content) - json.response_content task.response_content_json + json.response_content task.response_content json.delivered_time Time.at(task.delivered*10**-9).strftime("%Y-%m-%d %H:%M:%S") end \ No newline at end of file diff --git a/app/views/projects/webhooks/tasks.json.jbuilder b/app/views/projects/webhooks/tasks.json.jbuilder index 82b2eae4a..8e1809011 100644 --- a/app/views/projects/webhooks/tasks.json.jbuilder +++ b/app/views/projects/webhooks/tasks.json.jbuilder @@ -1,6 +1,6 @@ json.total_count @tasks.total_count json.tasks @tasks.each do |task| json.(task, :id, :event_type, :type, :uuid, :is_succeed, :is_delivered, :payload_content, :request_content) - json.response_content task.response_content_json - json.delivered_time Time.at(task.delivered*10**-9).strftime("%Y-%m-%d %H:%M:%S") + json.response_content task.response_content + json.delivered_time task.delivered.present? ? Time.at(task.delivered*10**-9).strftime("%Y-%m-%d %H:%M:%S") : nil end \ No newline at end of file