Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
chris
repanier
Commits
a601664a
Commit
a601664a
authored
Mar 22, 2017
by
Patrick
Browse files
Display user name as sender of mail send via Repanier to the other members of the group
parent
37976f33
Changes
1
Hide whitespace changes
Inline
Side-by-side
repanier/views/send_mail_to_all_members_view.py
View file @
a601664a
...
@@ -48,11 +48,11 @@ def send_mail_to_all_members_view(request):
...
@@ -48,11 +48,11 @@ def send_mail_to_all_members_view(request):
).
order_by
(
'?'
).
first
()
is
not
None
).
order_by
(
'?'
).
first
()
is
not
None
if
request
.
method
==
'POST'
:
if
request
.
method
==
'POST'
:
form
=
MembersContactValidationForm
(
request
.
POST
)
# A form bound to the POST data
form
=
MembersContactValidationForm
(
request
.
POST
)
# A form bound to the POST data
customer
=
Customer
.
objects
.
filter
(
user_
customer
=
Customer
.
objects
.
filter
(
customer_id
=
request
.
user
.
customer
.
id
,
id
=
request
.
user
.
customer
.
id
,
is_active
=
True
is_active
=
True
).
order_by
(
'?'
).
first
()
).
order_by
(
'?'
).
first
()
if
form
.
is_valid
()
and
customer
:
# All validation rules pass
if
form
.
is_valid
()
and
user_
customer
is
not
None
:
# All validation rules pass
to_email_customer
=
[]
to_email_customer
=
[]
if
is_coordinator
:
if
is_coordinator
:
qs
=
Customer
.
objects
.
filter
(
is_active
=
True
,
represent_this_buyinggroup
=
False
,
may_order
=
True
)
qs
=
Customer
.
objects
.
filter
(
is_active
=
True
,
represent_this_buyinggroup
=
False
,
may_order
=
True
)
...
@@ -71,7 +71,7 @@ def send_mail_to_all_members_view(request):
...
@@ -71,7 +71,7 @@ def send_mail_to_all_members_view(request):
from_email
=
request
.
user
.
email
,
from_email
=
request
.
user
.
email
,
cc
=
to_email_customer
cc
=
to_email_customer
)
)
send_email
(
email
=
email
,
from_name
=
customer
.
long_basket_name
)
send_email
(
email
=
email
,
from_name
=
user_
customer
.
long_basket_name
)
email
=
form
.
fields
[
"your_email"
]
email
=
form
.
fields
[
"your_email"
]
email
.
initial
=
request
.
user
.
email
email
.
initial
=
request
.
user
.
email
email
.
widget
.
attrs
[
'readonly'
]
=
True
email
.
widget
.
attrs
[
'readonly'
]
=
True
...
...
Write
Preview
Supports
Markdown
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