From c141e510b85f30e701f1659a688fea2337eda5bf Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 28 May 2020 18:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0children=5Fjournals?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb                   |  2 +-
 app/controllers/journals_controller.rb                 | 10 +++++++++-
 app/views/journals/_journal_item.json.jbuilder         |  1 -
 app/views/journals/get_children_journals.json.jbuilder |  8 ++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 app/views/journals/get_children_journals.json.jbuilder

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index efeca3ce..6481dcc4 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -447,7 +447,7 @@ class IssuesController < ApplicationController
         status_id: params[:status_id],
         priority_id: params[:priority_id],
         fixed_version_id: params[:fixed_version_id],
-        start_date: params[:start_date].to_s.to_date,
+        start_date: params[:start_date].to_s.to_date || Time.current.to_date,
         due_date: params[:due_date].to_s.to_date,
         estimated_hours: params[:estimated_hours],
         done_ratio: params[:done_ratio],
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 8803634e..785d181e 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -1,6 +1,6 @@
 class JournalsController < ApplicationController
   before_action :require_login, except: :index
-  before_action :set_issue
+  before_action :set_issue, except: :get_children_journals
   before_action :check_issue_permission
   before_action :set_journal, only: [:destroy, :edit, :update]
 
@@ -73,6 +73,14 @@ class JournalsController < ApplicationController
 
   end
 
+  def get_children_journals
+    @page  = params[:page]  || 1
+    @limit = params[:limit] || 10
+    journals = Journal.children_journals(params[:parent_id]).journal_includes.order("created_on desc")
+    @journals_size = journals.size
+    @children_journals = journals.page(@page).per(@limit)
+  end
+
 
   private
 
diff --git a/app/views/journals/_journal_item.json.jbuilder b/app/views/journals/_journal_item.json.jbuilder
index 03fd35c7..7522d915 100644
--- a/app/views/journals/_journal_item.json.jbuilder
+++ b/app/views/journals/_journal_item.json.jbuilder
@@ -4,7 +4,6 @@ json.user_login journal.user.try(:login)
 json.user_picture url_to_avatar(journal.user)
 json.is_journal_detail journal.is_journal_detail?  #判断是否修改了参数而添加的回复内容
 json.content journal.try(:notes)
-json.children_journals children_content(journal.id)
 json.journal_details journal.journal_content
 json.format_time format_time(journal.created_on)
 json.created_at time_from_now(journal.created_on)
diff --git a/app/views/journals/get_children_journals.json.jbuilder b/app/views/journals/get_children_journals.json.jbuilder
new file mode 100644
index 00000000..a46c6f75
--- /dev/null
+++ b/app/views/journals/get_children_journals.json.jbuilder
@@ -0,0 +1,8 @@
+json.partial! "commons/success"
+json.limit @limit
+json.journals_count @journals_size
+json.issue_journals do
+  json.array! @children_journals do |journal|
+    json.partial! "journals/journal_item", journal: journal
+  end
+end
\ No newline at end of file