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
caa64f3f
Commit
caa64f3f
authored
May 03, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bulk assignees
parent
97e30cd6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/javascripts/issues_bulk_assignment.js
app/assets/javascripts/issues_bulk_assignment.js
+4
-2
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+1
-1
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+6
-1
No files found.
app/assets/javascripts/issues_bulk_assignment.js
View file @
caa64f3f
...
@@ -85,11 +85,13 @@
...
@@ -85,11 +85,13 @@
*/
*/
getFormDataAsObject
()
{
getFormDataAsObject
()
{
// debugger
const
formData
=
{
const
formData
=
{
update
:
{
update
:
{
state_event
:
this
.
form
.
find
(
'
input[name="update[state_event]"]
'
).
val
(),
state_event
:
this
.
form
.
find
(
'
input[name="update[state_event]"]
'
).
val
(),
assignee_ids
:
this
.
form
.
find
(
'
input[name="update[assignee_ids][]"]
'
).
val
(),
// For Merge Requests
assignee_id
:
this
.
form
.
find
(
'
input[name="update[assignee_id]"]
'
).
val
(),
// For Issues
assignee_ids
:
[
this
.
form
.
find
(
'
input[name="update[assignee_ids][]"]
'
).
val
()],
milestone_id
:
this
.
form
.
find
(
'
input[name="update[milestone_id]"]
'
).
val
(),
milestone_id
:
this
.
form
.
find
(
'
input[name="update[milestone_id]"]
'
).
val
(),
issuable_ids
:
this
.
form
.
find
(
'
input[name="update[issuable_ids]"]
'
).
val
(),
issuable_ids
:
this
.
form
.
find
(
'
input[name="update[issuable_ids]"]
'
).
val
(),
subscription_event
:
this
.
form
.
find
(
'
input[name="update[subscription_event]"]
'
).
val
(),
subscription_event
:
this
.
form
.
find
(
'
input[name="update[subscription_event]"]
'
).
val
(),
...
...
app/controllers/concerns/issuable_actions.rb
View file @
caa64f3f
...
@@ -63,10 +63,10 @@ module IssuableActions
...
@@ -63,10 +63,10 @@ module IssuableActions
params
.
require
(
:update
).
permit
(
params
.
require
(
:update
).
permit
(
:issuable_ids
,
:issuable_ids
,
:assignee_id
,
:assignee_id
,
:assignee_ids
,
:milestone_id
,
:milestone_id
,
:state_event
,
:state_event
,
:subscription_event
,
:subscription_event
,
assignee_ids:
[],
label_ids:
[],
label_ids:
[],
add_label_ids:
[],
add_label_ids:
[],
remove_label_ids:
[]
remove_label_ids:
[]
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
caa64f3f
...
@@ -136,8 +136,13 @@
...
@@ -136,8 +136,13 @@
%li
%li
%a
{
href:
"#"
,
data:
{
id:
"close"
}
}
Closed
%a
{
href:
"#"
,
data:
{
id:
"close"
}
}
Closed
.filter-item.inline
.filter-item.inline
-
if
type
==
:issues
-
field_name
=
"update[assignee_ids][]"
-
else
-
field_name
=
"update[assignee_id]"
=
dropdown_tag
(
"Assignee"
,
options:
{
toggle_class:
"js-user-search js-update-assignee js-filter-submit js-filter-bulk-update"
,
title:
"Assign to"
,
filter:
true
,
dropdown_class:
"dropdown-menu-user dropdown-menu-selectable"
,
=
dropdown_tag
(
"Assignee"
,
options:
{
toggle_class:
"js-user-search js-update-assignee js-filter-submit js-filter-bulk-update"
,
title:
"Assign to"
,
filter:
true
,
dropdown_class:
"dropdown-menu-user dropdown-menu-selectable"
,
placeholder:
"Search authors"
,
data:
{
first_user:
(
current_user
.
username
if
current_user
),
null_user:
true
,
current_user:
true
,
project_id:
@project
.
id
,
field_name:
"update[assignee_ids][]"
}
})
placeholder:
"Search authors"
,
data:
{
first_user:
(
current_user
.
username
if
current_user
),
null_user:
true
,
current_user:
true
,
project_id:
@project
.
id
,
field_name:
field_name
}
})
.filter-item.inline
.filter-item.inline
=
dropdown_tag
(
"Milestone"
,
options:
{
title:
"Assign milestone"
,
toggle_class:
'js-milestone-select js-extra-options js-filter-submit js-filter-bulk-update'
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable dropdown-menu-milestone"
,
placeholder:
"Search milestones"
,
data:
{
show_no:
true
,
field_name:
"update[milestone_id]"
,
project_id:
@project
.
id
,
milestones:
namespace_project_milestones_path
(
@project
.
namespace
,
@project
,
:json
),
use_id:
true
}
})
=
dropdown_tag
(
"Milestone"
,
options:
{
title:
"Assign milestone"
,
toggle_class:
'js-milestone-select js-extra-options js-filter-submit js-filter-bulk-update'
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable dropdown-menu-milestone"
,
placeholder:
"Search milestones"
,
data:
{
show_no:
true
,
field_name:
"update[milestone_id]"
,
project_id:
@project
.
id
,
milestones:
namespace_project_milestones_path
(
@project
.
namespace
,
@project
,
:json
),
use_id:
true
}
})
.filter-item.inline.labels-filter
.filter-item.inline.labels-filter
...
...
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