diff --git a/app/models/journal.rb b/app/models/journal.rb index e4a7dcf9a..bea0a03c6 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -44,7 +44,7 @@ class Journal < ApplicationRecord belongs_to :reply_journal, class_name: 'Journal', foreign_key: :reply_id, optional: true has_many :journal_details, :dependent => :delete_all has_many :attachments, as: :container, dependent: :destroy - has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(10)}, class_name: 'Journal', foreign_key: :parent_id + has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(20)}, class_name: 'Journal', foreign_key: :parent_id has_many :children_journals, class_name: 'Journal', foreign_key: :parent_id, dependent: :destroy scope :journal_includes, ->{includes(:user, :journal_details, :attachments)} diff --git a/app/services/api/v1/issues/journals/list_service.rb b/app/services/api/v1/issues/journals/list_service.rb index 486fa5d3f..6d54e3b47 100644 --- a/app/services/api/v1/issues/journals/list_service.rb +++ b/app/services/api/v1/issues/journals/list_service.rb @@ -48,7 +48,7 @@ class Api::V1::Issues::Journals::ListService < ApplicationService @queried_journals = @queried_journals.where(notes: nil) end - @queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, first_ten_children_journals: [:parent_journal, :reply_journal]) + @queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, :children_journals) @queried_journals = @queried_journals.reorder("journals.#{sort_by} #{sort_direction}").distinct @queried_journals diff --git a/app/views/project_rank/_detail.json.jbuilder b/app/views/project_rank/_detail.json.jbuilder index d5b4b016b..c083033e1 100644 --- a/app/views/project_rank/_detail.json.jbuilder +++ b/app/views/project_rank/_detail.json.jbuilder @@ -3,8 +3,8 @@ owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id" json.id item[0] json.score item[1] json.name project_common["name"] -if project_common['identifier'].include?("/") - json.identifier project_common["identifier"].split('/')[1] +if project_common['identifier'].to_s.include?("/") + json.identifier project_common["identifier"].to_s.split('/')[1] json.owner do json.id nil json.type 'User'