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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
a27c336e
Commit
a27c336e
authored
Jul 02, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'assignement_change_notifications' into 'master'
Assignment change notifications Fixes #1377
parents
30b72919
12f696c2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
6 deletions
+19
-6
app/services/notification_service.rb
app/services/notification_service.rb
+12
-2
app/views/notify/reassigned_issue_email.html.haml
app/views/notify/reassigned_issue_email.html.haml
+4
-1
app/views/notify/reassigned_issue_email.text.erb
app/views/notify/reassigned_issue_email.text.erb
+1
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+2
-2
No files found.
app/services/notification_service.rb
View file @
a27c336e
...
...
@@ -301,7 +301,9 @@ class NotificationService
end
def
reassign_resource_email
(
target
,
project
,
current_user
,
method
)
recipients
=
User
.
where
(
id:
[
target
.
assignee_id
,
target
.
assignee_id_was
])
assignee_id_was
=
previous_record
(
target
,
"assignee_id"
)
recipients
=
User
.
where
(
id:
[
target
.
assignee_id
,
assignee_id_was
])
# Add watchers to email list
recipients
=
recipients
.
concat
(
project_watchers
(
project
))
...
...
@@ -313,11 +315,19 @@ class NotificationService
recipients
.
delete
(
current_user
)
recipients
.
each
do
|
recipient
|
mailer
.
send
(
method
,
recipient
.
id
,
target
.
id
,
target
.
assignee_id_was
,
current_user
.
id
)
mailer
.
send
(
method
,
recipient
.
id
,
target
.
id
,
assignee_id_was
,
current_user
.
id
)
end
end
def
mailer
Notify
.
delay
end
def
previous_record
(
object
,
attribute
)
if
object
&&
attribute
if
object
.
previous_changes
.
include?
(
attribute
)
object
.
previous_changes
[
attribute
].
first
end
end
end
end
app/views/notify/reassigned_issue_email.html.haml
View file @
a27c336e
...
...
@@ -4,5 +4,8 @@
from
%strong
#{
@previous_assignee
.
name
}
to
%strong
#{
@issue
.
assignee_name
}
-
if
@issue
.
assignee_id
%strong
#{
@issue
.
assignee_name
}
-
else
%strong
Unassigned
app/views/notify/reassigned_issue_email.text.erb
View file @
a27c336e
...
...
@@ -2,4 +2,4 @@ Reassigned Issue <%= @issue.iid %>
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
@issue
.
assignee_name
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
"
#{
@issue
.
assignee_id
?
@issue
.
assignee_name
:
'Unassigned'
}
"
%>
spec/services/notification_service_spec.rb
View file @
a27c336e
...
...
@@ -215,7 +215,7 @@ describe NotificationService do
end
def
should_email
(
user_id
)
Notify
.
should_receive
(
:reassigned_issue_email
).
with
(
user_id
,
issue
.
id
,
issue
.
assignee_id
,
@u_disabled
.
id
)
Notify
.
should_receive
(
:reassigned_issue_email
).
with
(
user_id
,
issue
.
id
,
nil
,
@u_disabled
.
id
)
end
def
should_not_email
(
user_id
)
...
...
@@ -279,7 +279,7 @@ describe NotificationService do
end
def
should_email
(
user_id
)
Notify
.
should_receive
(
:reassigned_merge_request_email
).
with
(
user_id
,
merge_request
.
id
,
merge_request
.
assignee_id
,
merge_request
.
author_id
)
Notify
.
should_receive
(
:reassigned_merge_request_email
).
with
(
user_id
,
merge_request
.
id
,
nil
,
merge_request
.
author_id
)
end
def
should_not_email
(
user_id
)
...
...
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