Skip to content

Commit bd02d30

Browse files
authored
Merge pull request #1088 from marksweb/fix/remove-old-models-file
chore: Remove old models file
2 parents 95dec56 + 2aa580d commit bd02d30

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

applications/models.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,26 @@ class Form(models.Model):
2525
"one. The application process is open from {INSERT DATE} "
2626
"until {INSERT DATE}. If you're curious about the criteria "
2727
"we use to choose applicants, you can read about it on "
28-
"<a href='http://blog.djangogirls.org/post/91067112853/"
28+
"<a href='https://blog.djangogirls.org/post/91067112853/"
2929
"djangogirls-how-we-scored-applications'>Django Girls "
3030
"blog</a>. Good luck!"
3131
)
3232
)
3333
confirmation_mail = models.TextField(
3434
default=_(
3535
"Hi there!\n\n"
36-
'This is a confirmation of your application to <a href="http://djangogirls.org/{city}">'
37-
"Django Girls {CITY}</a>. "
36+
"This is a confirmation of your application to "
37+
'<a href="https://djangogirls.org/{city}"> Django Girls {CITY}'
38+
"</a>. "
3839
"Yay! That's a huge step already, we're proud of you!\n\n"
3940
"Mind that this is not a confirmation of participation in the event, but a confirmation that we received "
4041
"your application.\n\n"
4142
"You'll receive an email from the team that organizes Django Girls {CITY} soon."
4243
"You can always reach them by answering to this email or by writing to {your event mail}.\n\n"
43-
"Please watch out for a confirmation email and add our email address to your address book, so that future emails do not go into spam."
44-
"In the past, we have had many email invitations to the workshop go into spam and have had many applicants miss our invitation!"
44+
"Please watch out for a confirmation email and add our email address to your address book, so that future "
45+
"emails do not go into spam."
46+
"In the past, we have had many email invitations to the workshop go into spam and have had many "
47+
"applicants miss our invitation!"
4548
"We wouldn't want that to happen to you! \n\n"
4649
"For your reference, we're attaching your answers below.\n\n"
4750
"Hugs, cupcakes and high-fives!\n"

core/models.py

Whitespace-only changes.

organize/models.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ def create(self, **data_dict):
6060
event_date = data_dict["date"]
6161
try:
6262
if date(event_date.year, event_date.month, event_date.day) - date(
63-
previous_event.date.year, previous_event.date.month, previous_event.date.day
63+
previous_event.date.year,
64+
previous_event.date.month,
65+
previous_event.date.day,
6466
) < timedelta(days=180):
6567
raise ValidationError(
6668
{
@@ -114,7 +116,8 @@ class EventApplication(models.Model):
114116
remote = models.BooleanField(default=False)
115117
tools = models.TextField(_("Information about how you will host your remote workshop"), blank=True)
116118
local_restrictions = models.TextField(
117-
_("Information about local restrictions for physical restrictions due to Covid-19 pandemic."), blank=True
119+
_("Information about local restrictions for physical restrictions due to Covid-19 pandemic."),
120+
blank=True,
118121
)
119122
safety = models.TextField(
120123
_("Information about how you will ensure participants' and coaches' safety during the Covid-19 pandemic"),
@@ -208,7 +211,7 @@ def deploy(self):
208211
- send email about deployment
209212
"""
210213
if self.status == DEPLOYED: # we don't want to deploy twice
211-
return
214+
return None
212215

213216
self.change_status_to(DEPLOYED)
214217

@@ -234,7 +237,7 @@ def deploy(self):
234237

235238
def send_deployed_email(self, event):
236239
# sort out Gmail accounts
237-
dummy_email, email_password = gmail_accounts.get_or_create_gmail(event_application=self, event=event)
240+
_, email_password = gmail_accounts.get_or_create_gmail(event_application=self, event=event)
238241

239242
# TODO: remove organizers, who are no longer in org team if cloned
240243
send_application_deployed_email(event_application=self, event=event, email_password=email_password)

0 commit comments

Comments
 (0)