Resolve conlict
This commit is contained in:
@@ -12,6 +12,7 @@ import logging
|
||||
import html
|
||||
|
||||
from webapp.utils import send_email
|
||||
from webapp.utils import add_to_mailinglist
|
||||
|
||||
from members.views.utils import *
|
||||
from members.tables import RequestTable
|
||||
@@ -88,6 +89,9 @@ def application_accept(request, *args, **kwargs):
|
||||
).format(application.email),
|
||||
)
|
||||
|
||||
if application.jas:
|
||||
add_to_mailinglist(application.email)
|
||||
|
||||
member = application.to_member()
|
||||
member.save()
|
||||
application.delete()
|
||||
|
||||
Reference in New Issue
Block a user