Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes to sponsorship packet stuff #16

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Minor fixes to sponsorship packet stuff #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
392f768
emails: Use shared packet code when getting the path to the packet
Tookmund Dec 23, 2019
b22fb3b
SPONSORSHIP_PACKET_FILE defaults to "sponsorship.pdf"
Tookmund Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion emails/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
from hackathons.models import Hackathon, Sponsorship, Lead
from hackathons.views.sponsorships import combine_lead_and_contacts

from shared import packet

from .models import Email
from .forms import ComposeFromContactsForm, ComposeFromCompanyForm, ComposeFromIndustryForm, EmailChangeTypeForm

Expand Down Expand Up @@ -159,7 +161,7 @@ def send_message(request, h_pk, pk):
message = email.render_body(contact)
packet_file = None
if email.attach_packet:
packet_file = os.path.join(settings.PROJECT_ROOT, 'static', settings.SPONSORSHIP_PACKET_FILE)
packet_file = packet.get_packet_file_path()

print(f"SENDING: {email.subject} TO: {contact} ({contact.email}) ATTACHMENT: {packet_file}")
print(send_email_now(email.subject, message, contact.email, packet_file))
Expand Down
2 changes: 1 addition & 1 deletion website/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def str_environ(name, default=None):
# The local name of the sponsorship packet, to be stored in the website/static
# folder. If this file exists, it will be used. Otherwise, it will be
# redownloaded from SPONSORSHIP_PACKET_URL.
SPONSORSHIP_PACKET_FILE = str_environ("SPONSORSHIP_PACKET_FILE")
SPONSORSHIP_PACKET_FILE = str_environ("SPONSORSHIP_PACKET_FILE", "sponsorship.pdf")

if not PRODUCTION and 'DEBUG' not in os.environ:
DEBUG = True
Expand Down