Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
dfcf1b5a
Commit
dfcf1b5a
authored
Jun 29, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport changes to Projects::IssuesController and the search bar
parent
dba76332
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
5 deletions
+19
-5
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+16
-4
app/views/shared/_sort_dropdown.html.haml
app/views/shared/_sort_dropdown.html.haml
+3
-1
No files found.
app/controllers/projects/issues_controller.rb
View file @
dfcf1b5a
...
@@ -267,10 +267,22 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -267,10 +267,22 @@ class Projects::IssuesController < Projects::ApplicationController
end
end
def
issue_params
def
issue_params
params
.
require
(
:issue
).
permit
(
params
.
require
(
:issue
).
permit
(
*
issue_params_attributes
)
:title
,
:assignee_id
,
:position
,
:description
,
:confidential
,
end
:milestone_id
,
:due_date
,
:state_event
,
:task_num
,
:lock_version
,
label_ids:
[],
assignee_ids:
[]
)
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
end
def
authenticate_user!
def
authenticate_user!
...
...
app/views/shared/_sort_dropdown.html.haml
View file @
dfcf1b5a
-
viewing_issues
=
controller
.
controller_name
==
'issues'
||
controller
.
action_name
==
'issues'
.dropdown.inline.prepend-left-10
.dropdown.inline.prepend-left-10
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
%button
.dropdown-toggle
{
type:
'button'
,
data:
{
toggle:
'dropdown'
}
}
-
if
@sort
.
present?
-
if
@sort
.
present?
...
@@ -23,7 +25,7 @@
...
@@ -23,7 +25,7 @@
=
sort_title_milestone_soon
=
sort_title_milestone_soon
=
link_to
page_filter_path
(
sort:
sort_value_milestone_later
,
label:
true
)
do
=
link_to
page_filter_path
(
sort:
sort_value_milestone_later
,
label:
true
)
do
=
sort_title_milestone_later
=
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
=
link_to
page_filter_path
(
sort:
sort_value_due_date_soon
,
label:
true
)
do
=
sort_title_due_date_soon
=
sort_title_due_date_soon
=
link_to
page_filter_path
(
sort:
sort_value_due_date_later
,
label:
true
)
do
=
link_to
page_filter_path
(
sort:
sort_value_due_date_later
,
label:
true
)
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment