添加children_journals
This commit is contained in:
parent
dd871ba481
commit
c141e510b8
|
@ -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],
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue