Merge branch 'develop' into standalone_develop
This commit is contained in:
commit
37f7587dc0
|
@ -3,7 +3,7 @@ class Api::V1::ProjectTopicsController < Api::V1::BaseController
|
||||||
def index
|
def index
|
||||||
@project_topics = ProjectTopic
|
@project_topics = ProjectTopic
|
||||||
@project_topics = @project_topics.ransack(name_cont: params[:keyword]) if params[:keyword].present?
|
@project_topics = @project_topics.ransack(name_cont: params[:keyword]) if params[:keyword].present?
|
||||||
@project_topics = @project_topics.includes(:projects)
|
# @project_topics = @project_topics.includes(:projects)
|
||||||
@project_topics = kaminary_select_paginate(@project_topics)
|
@project_topics = kaminary_select_paginate(@project_topics)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue