diff options
author | Matija Čupić <matteeyah@gmail.com> | 2017-12-01 00:23:10 +0300 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-11 17:06:45 +0300 |
commit | 4882c793019f4c46ca20e0c187dc97e10cf5a3ce (patch) | |
tree | c8f965ebda2b28aff5f9b39b1cd31af72a4a789f /app/controllers/projects | |
parent | 8ff63039f1ee5f6e31a8b910e323977e7de3c634 (diff) |
Remove cluster scope from ClustersController#index
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/clusters_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 0907daacbc3..4a7879db313 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -8,11 +8,8 @@ class Projects::ClustersController < Projects::ApplicationController STATUS_POLLING_INTERVAL = 10_000 def index - @scope = params[:scope] || 'all' - @clusters = ClustersFinder.new(project, current_user, @scope).execute.page(params[:page]) - @active_count = ClustersFinder.new(project, current_user, :active).execute.count - @inactive_count = ClustersFinder.new(project, current_user, :inactive).execute.count - @all_count = @active_count + @inactive_count + clusters = ClustersFinder.new(project, current_user, :all).execute + @clusters = clusters.page(params[:page]).per(20) end def new |