Merge branch 'fe-paginated-environments-api' into fe-paginated-environments-api-add-pagination
* fe-paginated-environments-api: Add count keys to response JSON
This commit is contained in:
commit
6483bc8ca6
|
@ -29,9 +29,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def folder
|
def folder
|
||||||
@environments = project.environments
|
folder_environments = project.environments.where(environment_type: params[:id])
|
||||||
.where(environment_type: params[:id])
|
@environments = folder_environments.with_state(params[:scope] || :available)
|
||||||
.with_state(params[:scope] || :available)
|
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html
|
format.html
|
||||||
|
@ -41,6 +40,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
|
||||||
.new(project: @project, user: @current_user)
|
.new(project: @project, user: @current_user)
|
||||||
.with_pagination(request, response)
|
.with_pagination(request, response)
|
||||||
.represent(@environments),
|
.represent(@environments),
|
||||||
|
available_count: folder_environments.available.count,
|
||||||
|
stopped_count: folder_environments.stopped.count
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue