Commit ae352dec authored by Sean McGivern's avatar Sean McGivern Committed by Bryce Johnson

Fix IssuesController redirects

parent f8981fae
...@@ -10,6 +10,7 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -10,6 +10,7 @@ class Projects::IssuesController < Projects::ApplicationController
before_action :check_issues_available! before_action :check_issues_available!
before_action :issue, except: [:index, :new, :create, :bulk_update, :export_csv] before_action :issue, except: [:index, :new, :create, :bulk_update, :export_csv]
before_action :set_issues_index, only: [:index]
# Allow write(create) issue # Allow write(create) issue
before_action :authorize_create_issue!, only: [:new, :create] before_action :authorize_create_issue!, only: [:new, :create]
...@@ -25,8 +26,6 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -25,8 +26,6 @@ class Projects::IssuesController < Projects::ApplicationController
respond_to :html respond_to :html
def index def index
set_issues_index
if params[:assignee_id].present? if params[:assignee_id].present?
assignee = User.find_by_id(params[:assignee_id]) assignee = User.find_by_id(params[:assignee_id])
@users.push(assignee) if assignee @users.push(assignee) if assignee
......
...@@ -6,12 +6,11 @@ module EE ...@@ -6,12 +6,11 @@ module EE
prepended do prepended do
before_action :check_export_issues_available!, only: [:export_csv] before_action :check_export_issues_available!, only: [:export_csv]
before_action :check_service_desk_available!, only: [:service_desk] before_action :check_service_desk_available!, only: [:service_desk]
before_action :set_issues_index, only: [:index, :service_desk]
skip_before_action :issue, only: [:service_desk] skip_before_action :issue, only: [:service_desk]
end end
def service_desk def service_desk
set_issues_index
if params[:assignee_id].present? if params[:assignee_id].present?
assignee = User.find_by_id(params[:assignee_id]) assignee = User.find_by_id(params[:assignee_id])
@users.push(assignee) if assignee @users.push(assignee) if assignee
......
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