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
Boxiang Sun
gitlab-ce
Commits
aaeb3741
Commit
aaeb3741
authored
12 years ago
by
Alex Denisov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Send notifiation on create UserProject relation (access granted)
parent
2c32574a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
78 additions
and
0 deletions
+78
-0
app/mailers/notify.rb
app/mailers/notify.rb
+7
-0
app/observers/users_project_observer.rb
app/observers/users_project_observer.rb
+5
-0
app/views/notify/project_access_granted_email.html.haml
app/views/notify/project_access_granted_email.html.haml
+14
-0
spec/factories.rb
spec/factories.rb
+5
-0
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+20
-0
spec/observers/users_project_observer_spec.rb
spec/observers/users_project_observer_spec.rb
+27
-0
No files found.
app/mailers/notify.rb
View file @
aaeb3741
...
...
@@ -76,6 +76,13 @@ class Notify < ActionMailer::Base
mail
(
to:
recipient
(
recipient_id
),
subject:
subject
(
"changed issue #
#{
@issue
.
id
}
"
,
@issue
.
title
))
end
def
project_access_granted_email
(
user_project_id
)
@users_project
=
UsersProject
.
find
user_project_id
@project
=
@users_project
.
project
mail
(
to:
@users_project
.
user
.
email
,
subject:
subject
(
"access to project was granted"
))
end
private
# Look up a User by their ID and return their email address
...
...
This diff is collapsed.
Click to expand it.
app/observers/users_project_observer.rb
0 → 100644
View file @
aaeb3741
class
UsersProjectObserver
<
ActiveRecord
::
Observer
def
after_create
(
users_project
)
Notify
.
project_access_granted_email
(
users_project
.
id
).
deliver
end
end
This diff is collapsed.
Click to expand it.
app/views/notify/project_access_granted_email.html.haml
0 → 100644
View file @
aaeb3741
%td
.content
{
align:
"left"
,
style:
"font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;"
,
valign:
"top"
,
width:
"600"
}
%table
{
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
style:
"color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;"
,
width:
"600"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%h2
{
style:
"color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
=
"You got granted
#{
@users_project
.
project_access_human
}
access to project"
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%tr
%td
{
style:
"font-size: 1px; line-height: 1px;"
,
width:
"21"
}
%td
{
align:
"left"
,
style:
"padding: 20px 0 0;"
}
%h2
{
style:
"color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "
}
=
link_to_gfm
truncate
(
@project
.
name
,
length:
45
),
project_url
(
@project
),
title:
@project
.
name
%br
This diff is collapsed.
Click to expand it.
spec/factories.rb
View file @
aaeb3741
...
...
@@ -90,3 +90,8 @@ Factory.add(:milestone, Milestone) do |obj|
obj
.
title
=
Faker
::
Lorem
.
sentence
obj
.
due_date
=
Date
.
today
+
1
.
month
end
Factory
.
add
(
:users_project
,
UsersProject
)
do
|
obj
|
obj
.
user
=
Factory
:user
obj
.
project
=
Factory
:project
end
This diff is collapsed.
Click to expand it.
spec/mailers/notify_spec.rb
View file @
aaeb3741
...
...
@@ -145,6 +145,26 @@ describe Notify do
end
end
describe
'project access changed'
do
let
(
:project
)
{
Factory
.
create
(
:project
,
path:
"Fuu"
,
code:
"Fuu"
)
}
let
(
:user
)
{
Factory
.
create
:user
}
let
(
:users_project
)
{
Factory
.
create
(
:users_project
,
project:
project
,
user:
user
)
}
subject
{
Notify
.
project_access_granted_email
(
users_project
.
id
)
}
it
'has the correct subject'
do
should
have_subject
/access to project was granted/
end
it
'contains name of project'
do
should
have_body_text
/
#{
project
.
name
}
/
end
it
'contains new user role'
do
should
have_body_text
/
#{
users_project
.
project_access_human
}
/
end
end
context
'items that are noteable, the email for a note'
do
let
(
:note_author
)
{
Factory
.
create
(
:user
,
name:
'author_name'
)
}
let
(
:note
)
{
Factory
.
create
(
:note
,
project:
project
,
author:
note_author
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/observers/users_project_observer_spec.rb
0 → 100644
View file @
aaeb3741
require
'spec_helper'
describe
UsersProjectObserver
do
let
(
:user
)
{
Factory
.
create
:user
}
let
(
:project
)
{
Factory
.
create
(
:project
,
code:
"Fuu"
,
path:
"Fuu"
)
}
let
(
:users_project
)
{
Factory
.
create
(
:users_project
,
project:
project
,
user:
user
)}
subject
{
UsersProjectObserver
.
instance
}
describe
"#after_create"
do
it
"should called when UsersProject created"
do
subject
.
should_receive
(
:after_create
)
UsersProject
.
observers
.
enable
:users_project_observer
do
Factory
.
create
(
:users_project
,
project:
project
,
user:
user
)
end
end
it
"should send email to user"
do
Notify
.
should_receive
(
:project_access_granted_email
).
with
(
users_project
.
id
).
and_return
(
double
(
deliver:
true
))
subject
.
after_create
(
users_project
)
end
end
end
This diff is collapsed.
Click to expand it.
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