Backport changes to Projects::IssuesController and the search bar
This commit is contained in:
parent
dba763322c
commit
dfcf1b5a44
|
@ -267,10 +267,22 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def issue_params
|
||||
params.require(:issue).permit(
|
||||
:title, :assignee_id, :position, :description, :confidential,
|
||||
:milestone_id, :due_date, :state_event, :task_num, :lock_version, label_ids: [], assignee_ids: []
|
||||
)
|
||||
params.require(:issue).permit(*issue_params_attributes)
|
||||
end
|
||||
|
||||
def issue_params_attributes
|
||||
%i[
|
||||
title
|
||||
assignee_id
|
||||
position
|
||||
description
|
||||
confidential
|
||||
milestone_id
|
||||
due_date
|
||||
state_event
|
||||
task_num
|
||||
lock_version
|
||||
] + [{ label_ids: [], assignee_ids: [] }]
|
||||
end
|
||||
|
||||
def authenticate_user!
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
- viewing_issues = controller.controller_name == 'issues' || controller.action_name == 'issues'
|
||||
|
||||
.dropdown.inline.prepend-left-10
|
||||
%button.dropdown-toggle{ type: 'button', data: {toggle: 'dropdown' } }
|
||||
- if @sort.present?
|
||||
|
@ -23,7 +25,7 @@
|
|||
= sort_title_milestone_soon
|
||||
= link_to page_filter_path(sort: sort_value_milestone_later, label: true) do
|
||||
= sort_title_milestone_later
|
||||
- if controller.controller_name == 'issues' || controller.action_name == 'issues'
|
||||
- if viewing_issues
|
||||
= link_to page_filter_path(sort: sort_value_due_date_soon, label: true) do
|
||||
= sort_title_due_date_soon
|
||||
= link_to page_filter_path(sort: sort_value_due_date_later, label: true) do
|
||||
|
|
Loading…
Reference in New Issue