Commit eca3015d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix group labels page timeout if many projects and labels

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 88239e94
...@@ -2,7 +2,6 @@ class Groups::LabelsController < Groups::ApplicationController ...@@ -2,7 +2,6 @@ class Groups::LabelsController < Groups::ApplicationController
include ToggleSubscriptionAction include ToggleSubscriptionAction
before_action :label, only: [:edit, :update, :destroy] before_action :label, only: [:edit, :update, :destroy]
before_action :available_labels, only: [:index]
before_action :authorize_admin_labels!, only: [:new, :create, :edit, :update, :destroy] before_action :authorize_admin_labels!, only: [:new, :create, :edit, :update, :destroy]
before_action :save_previous_label_path, only: [:edit] before_action :save_previous_label_path, only: [:edit]
...@@ -11,10 +10,12 @@ class Groups::LabelsController < Groups::ApplicationController ...@@ -11,10 +10,12 @@ class Groups::LabelsController < Groups::ApplicationController
def index def index
respond_to do |format| respond_to do |format|
format.html do format.html do
@labels = @available_labels.page(params[:page]) @labels = @group.labels
@labels = @labels.search(params[:search]) if params[:search].present?
@labels = @labels.page(params[:page])
end end
format.json do format.json do
render json: LabelSerializer.new.represent_appearance(@available_labels) render json: LabelSerializer.new.represent_appearance(available_labels)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment