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
b673d872
Commit
b673d872
authored
Mar 06, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Send notifications and leave system comments when bulk updating issues.
parent
8b53d9ef
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
46 deletions
+33
-46
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+10
-1
app/services/issues/bulk_update_service.rb
app/services/issues/bulk_update_service.rb
+10
-25
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+2
-2
spec/services/issues/bulk_update_service_spec.rb
spec/services/issues/bulk_update_service_spec.rb
+10
-18
No files found.
CHANGELOG
View file @
b673d872
...
@@ -26,6 +26,7 @@ v 7.9.0 (unreleased)
...
@@ -26,6 +26,7 @@ v 7.9.0 (unreleased)
- Add Bitbucket omniauth provider.
- Add Bitbucket omniauth provider.
- Add Bitbucket importer.
- Add Bitbucket importer.
- Support referencing issues to a project whose name starts with a digit
- Support referencing issues to a project whose name starts with a digit
- Send notifications and leave system comments when bulk updating issues.
v 7.8.2
v 7.8.2
- Fix service migration issue when upgrading from versions prior to 7.3
- Fix service migration issue when upgrading from versions prior to 7.3
...
...
app/controllers/projects/issues_controller.rb
View file @
b673d872
...
@@ -93,7 +93,7 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -93,7 +93,7 @@ class Projects::IssuesController < Projects::ApplicationController
end
end
def
bulk_update
def
bulk_update
result
=
Issues
::
BulkUpdateService
.
new
(
project
,
current_user
,
params
).
execute
result
=
Issues
::
BulkUpdateService
.
new
(
project
,
current_user
,
bulk_update_
params
).
execute
redirect_to
:back
,
notice:
"
#{
result
[
:count
]
}
issues updated"
redirect_to
:back
,
notice:
"
#{
result
[
:count
]
}
issues updated"
end
end
...
@@ -141,4 +141,13 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -141,4 +141,13 @@ class Projects::IssuesController < Projects::ApplicationController
:milestone_id
,
:state_event
,
:task_num
,
label_ids:
[]
:milestone_id
,
:state_event
,
:task_num
,
label_ids:
[]
)
)
end
end
def
bulk_update_params
params
.
require
(
:update
).
permit
(
:issues_ids
,
:assignee_id
,
:milestone_id
,
:state_event
)
end
end
end
app/services/issues/bulk_update_service.rb
View file @
b673d872
module
Issues
module
Issues
class
BulkUpdateService
<
BaseService
class
BulkUpdateService
<
BaseService
def
execute
def
execute
update_data
=
params
[
:update
]
issues_ids
=
params
.
delete
(
:issues_ids
).
split
(
","
)
issue_params
=
params
issues_ids
=
update_data
[
:issues_ids
].
split
(
","
)
issue_params
.
delete
(
:state_event
)
unless
issue_params
[
:state_event
].
present?
milestone_id
=
update_data
[
:milestone_id
]
issue_params
.
delete
(
:milestone_id
)
unless
issue_params
[
:milestone_id
].
present?
assignee_id
=
update_data
[
:assignee_id
]
issue_params
.
delete
(
:assignee_id
)
unless
issue_params
[
:assignee_id
].
present?
status
=
update_data
[
:status
]
new_state
=
nil
if
status
.
present?
if
status
==
'closed'
new_state
=
:close
else
new_state
=
:reopen
end
end
opts
=
{}
opts
[
:milestone_id
]
=
milestone_id
if
milestone_id
.
present?
opts
[
:assignee_id
]
=
assignee_id
if
assignee_id
.
present?
issues
=
Issue
.
where
(
id:
issues_ids
)
issues
=
Issue
.
where
(
id:
issues_ids
)
issues
=
issues
.
select
{
|
issue
|
can?
(
current_user
,
:modify_issue
,
issue
)
}
issues
.
each
do
|
issue
|
issues
.
each
do
|
issue
|
issue
.
update_attributes
(
opts
)
next
unless
can?
(
current_user
,
:modify_issue
,
issue
)
issue
.
send
new_state
if
new_state
Issues
::
UpdateService
.
new
(
issue
.
project
,
current_user
,
issue_params
).
execute
(
issue
)
end
end
{
{
count:
issues
.
count
,
count:
issues
.
count
,
success:
!
issues
.
count
.
zero?
success:
!
issues
.
count
.
zero?
}
}
end
end
end
end
...
...
app/views/projects/issues/index.html.haml
View file @
b673d872
...
@@ -25,11 +25,11 @@
...
@@ -25,11 +25,11 @@
.clearfix
.clearfix
.issues_bulk_update.hide
.issues_bulk_update.hide
=
form_tag
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
),
method: :post
do
=
form_tag
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
),
method: :post
do
=
select_tag
(
'update[stat
us]'
,
options_for_select
([[
'Open'
,
'open'
],
[
'Closed'
,
'closed
'
]]),
prompt:
"Status"
)
=
select_tag
(
'update[stat
e_event]'
,
options_for_select
([[
'Open'
,
'reopen'
],
[
'Closed'
,
'close
'
]]),
prompt:
"Status"
)
=
project_users_select_tag
(
'update[assignee_id]'
,
placeholder:
'Assignee'
)
=
project_users_select_tag
(
'update[assignee_id]'
,
placeholder:
'Assignee'
)
=
select_tag
(
'update[milestone_id]'
,
bulk_update_milestone_options
,
prompt:
"Milestone"
)
=
select_tag
(
'update[milestone_id]'
,
bulk_update_milestone_options
,
prompt:
"Milestone"
)
=
hidden_field_tag
'update[issues_ids]'
,
[]
=
hidden_field_tag
'update[issues_ids]'
,
[]
=
hidden_field_tag
:stat
us
,
params
[
:status
]
=
hidden_field_tag
:stat
e_event
,
params
[
:state_event
]
=
button_tag
"Update issues"
,
class:
"btn update_selected_issues btn-save"
=
button_tag
"Update issues"
,
class:
"btn update_selected_issues btn-save"
.issues-holder
.issues-holder
...
...
spec/services/issues/bulk_update_service_spec.rb
View file @
b673d872
...
@@ -21,10 +21,8 @@ describe Issues::BulkUpdateService do
...
@@ -21,10 +21,8 @@ describe Issues::BulkUpdateService do
create
(
:issue
,
project:
@project
)
create
(
:issue
,
project:
@project
)
end
end
@params
=
{
@params
=
{
update:
{
state_event:
'close'
,
status:
'closed'
,
issues_ids:
@issues
.
map
(
&
:id
)
issues_ids:
@issues
.
map
(
&
:id
)
}
}
}
end
end
...
@@ -46,10 +44,8 @@ describe Issues::BulkUpdateService do
...
@@ -46,10 +44,8 @@ describe Issues::BulkUpdateService do
create
(
:closed_issue
,
project:
@project
)
create
(
:closed_issue
,
project:
@project
)
end
end
@params
=
{
@params
=
{
update:
{
state_event:
'reopen'
,
status:
'reopen'
,
issues_ids:
@issues
.
map
(
&
:id
)
issues_ids:
@issues
.
map
(
&
:id
)
}
}
}
end
end
...
@@ -69,10 +65,8 @@ describe Issues::BulkUpdateService do
...
@@ -69,10 +65,8 @@ describe Issues::BulkUpdateService do
before
do
before
do
@new_assignee
=
create
:user
@new_assignee
=
create
:user
@params
=
{
@params
=
{
update:
{
issues_ids:
[
issue
.
id
],
issues_ids:
[
issue
.
id
],
assignee_id:
@new_assignee
.
id
assignee_id:
@new_assignee
.
id
}
}
}
end
end
...
@@ -88,7 +82,7 @@ describe Issues::BulkUpdateService do
...
@@ -88,7 +82,7 @@ describe Issues::BulkUpdateService do
@project
.
issues
.
first
.
update_attribute
(
:assignee
,
@new_assignee
)
@project
.
issues
.
first
.
update_attribute
(
:assignee
,
@new_assignee
)
expect
(
@project
.
issues
.
first
.
assignee
).
not_to
be_nil
expect
(
@project
.
issues
.
first
.
assignee
).
not_to
be_nil
@params
[
:
update
][
:
assignee_id
]
=
-
1
@params
[
:assignee_id
]
=
-
1
Issues
::
BulkUpdateService
.
new
(
@project
,
@user
,
@params
).
execute
Issues
::
BulkUpdateService
.
new
(
@project
,
@user
,
@params
).
execute
expect
(
@project
.
issues
.
first
.
assignee
).
to
be_nil
expect
(
@project
.
issues
.
first
.
assignee
).
to
be_nil
...
@@ -98,7 +92,7 @@ describe Issues::BulkUpdateService do
...
@@ -98,7 +92,7 @@ describe Issues::BulkUpdateService do
@project
.
issues
.
first
.
update_attribute
(
:assignee
,
@new_assignee
)
@project
.
issues
.
first
.
update_attribute
(
:assignee
,
@new_assignee
)
expect
(
@project
.
issues
.
first
.
assignee
).
not_to
be_nil
expect
(
@project
.
issues
.
first
.
assignee
).
not_to
be_nil
@params
[
:
update
][
:
assignee_id
]
=
''
@params
[
:assignee_id
]
=
''
Issues
::
BulkUpdateService
.
new
(
@project
,
@user
,
@params
).
execute
Issues
::
BulkUpdateService
.
new
(
@project
,
@user
,
@params
).
execute
expect
(
@project
.
issues
.
first
.
assignee
).
not_to
be_nil
expect
(
@project
.
issues
.
first
.
assignee
).
not_to
be_nil
...
@@ -110,10 +104,8 @@ describe Issues::BulkUpdateService do
...
@@ -110,10 +104,8 @@ describe Issues::BulkUpdateService do
before
do
before
do
@milestone
=
create
:milestone
@milestone
=
create
:milestone
@params
=
{
@params
=
{
update:
{
issues_ids:
[
issue
.
id
],
issues_ids:
[
issue
.
id
],
milestone_id:
@milestone
.
id
milestone_id:
@milestone
.
id
}
}
}
end
end
...
...
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