kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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:
Filipa Lacerda 2017-02-15 19:07:26 +00:00
parent c2fe699ac8 a254dcf0ed
commit 6483bc8ca6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/projects/environments_controller.rb
View File

@ -29,9 +29,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
end
def folder
@environments = project.environments
.where(environment_type: params[:id])
.with_state(params[:scope] || :available)
folder_environments = project.environments.where(environment_type: params[:id])
@environments = folder_environments.with_state(params[:scope] || :available)
respond_to do |format|
format.html
@ -41,6 +40,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
.new(project: @project, user: @current_user)
.with_pagination(request, response)
.represent(@environments),
available_count: folder_environments.available.count,
stopped_count: folder_environments.stopped.count
}
end
end