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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
39f82b75
Commit
39f82b75
authored
Jul 02, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
When assigning an unassigned issue send notification with the correct text.
parent
119b0287
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
4 deletions
+18
-4
app/services/notification_service.rb
app/services/notification_service.rb
+13
-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
No files found.
app/services/notification_service.rb
View file @
39f82b75
...
@@ -301,7 +301,9 @@ class NotificationService
...
@@ -301,7 +301,9 @@ class NotificationService
end
end
def
reassign_resource_email
(
target
,
project
,
current_user
,
method
)
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
# Add watchers to email list
recipients
=
recipients
.
concat
(
project_watchers
(
project
))
recipients
=
recipients
.
concat
(
project_watchers
(
project
))
...
@@ -313,11 +315,20 @@ class NotificationService
...
@@ -313,11 +315,20 @@ class NotificationService
recipients
.
delete
(
current_user
)
recipients
.
delete
(
current_user
)
recipients
.
each
do
|
recipient
|
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
end
end
def
mailer
def
mailer
Notify
.
delay
Notify
.
delay
end
end
def
previous_record
(
object
,
attribute
)
if
object
&&
attribute
if
object
.
previous_changes
.
include?
(
attribute
)
return
object
.
previous_changes
[
attribute
].
first
end
end
nil
end
end
end
app/views/notify/reassigned_issue_email.html.haml
View file @
39f82b75
...
@@ -4,5 +4,8 @@
...
@@ -4,5 +4,8 @@
from
from
%strong
#{
@previous_assignee
.
name
}
%strong
#{
@previous_assignee
.
name
}
to
to
-
if
@issue
.
assignee_id
%strong
#{
@issue
.
assignee_name
}
%strong
#{
@issue
.
assignee_name
}
-
else
%strong
Unassigned
app/views/notify/reassigned_issue_email.text.erb
View file @
39f82b75
...
@@ -2,4 +2,4 @@ Reassigned Issue <%= @issue.iid %>
...
@@ -2,4 +2,4 @@ Reassigned Issue <%= @issue.iid %>
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
<%=
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'
}
"
%>
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