Merge pull request '调整 pm issue journal返回值' (#200) from KingChan/forgeplus:pm_project_develop into pm_project_develop
This commit is contained in:
commit
ef18964ad1
|
@ -10,19 +10,23 @@ class Api::Pm::JournalsController < Api::Pm::BaseController
|
|||
@total_operate_journals_count = @object_result[:total_operate_journals_count]
|
||||
@total_comment_journals_count = @object_result[:total_comment_journals_count]
|
||||
@journals = kaminary_select_paginate(@object_result[:data])
|
||||
render 'api/v1/issues/journals/index'
|
||||
end
|
||||
|
||||
def create
|
||||
@object_result = Api::V1::Issues::Journals::CreateService.call(@issue, journal_params, current_user)
|
||||
render 'api/v1/issues/journals/show'
|
||||
end
|
||||
|
||||
def children_journals
|
||||
@object_results = Api::V1::Issues::Journals::ChildrenListService.call(@issue, @journal, query_params, current_user)
|
||||
@journals = kaminari_paginate(@object_results)
|
||||
render 'api/v1/issues/journals/show'
|
||||
end
|
||||
|
||||
def update
|
||||
@object_result = Api::V1::Issues::Journals::UpdateService.call(@issue, @journal, journal_params, current_user)
|
||||
render 'api/v1/issues/journals/show'
|
||||
end
|
||||
|
||||
def destroy
|
||||
|
|
|
@ -17,7 +17,7 @@ else
|
|||
json.notes journal.notes
|
||||
json.comments_count journal.comments_count
|
||||
json.children_journals journal.first_ten_children_journals.each do |journal|
|
||||
json.partial! "children_detail", journal: journal
|
||||
json.partial! "api/v1/issues/journals/children_detail", journal: journal
|
||||
end
|
||||
json.attachments journal.attachments do |attachment|
|
||||
json.partial! "api/v1/attachments/simple_detail", locals: {attachment: attachment}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
json.total_count @journals.total_count
|
||||
json.journals @journals do |journal|
|
||||
json.partial! "children_detail", journal: journal
|
||||
json.partial! "api/v1/issues/journals/children_detail", journal: journal
|
||||
end
|
|
@ -1 +1 @@
|
|||
json.partial! "detail", journal: @object_result
|
||||
json.partial! "api/v1/issues/journals/detail", journal: @object_result
|
|
@ -4,5 +4,5 @@ json.total_comment_journals_count @total_comment_journals_count
|
|||
json.total_count @journals.total_count
|
||||
json.journals @journals do |journal|
|
||||
journal.associate_attachment_container
|
||||
json.partial! "detail", journal: journal
|
||||
json.partial! "api/v1/issues/journals/detail", journal: journal
|
||||
end
|
|
@ -1 +1 @@
|
|||
json.partial! "detail", journal: @object_result
|
||||
json.partial! "api/v1/issues/journals/detail", journal: @object_result
|
Loading…
Reference in New Issue