From: Michael Tremer Date: Tue, 19 Nov 2019 13:59:41 +0000 (+0000) Subject: campaigns: Give them a name X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18c38597206c8dbec1a6edad7b10594583f88986;p=ipfire.org.git campaigns: Give them a name Signed-off-by: Michael Tremer --- diff --git a/src/backend/accounts.py b/src/backend/accounts.py index 6d01ac2e..24261192 100644 --- a/src/backend/accounts.py +++ b/src/backend/accounts.py @@ -375,7 +375,7 @@ class Accounts(Object): recipients=["moderators@ipfire.org"], account=account) # Launch all drip campaigns - self.backend.campaigns.launch(account) + self.backend.campaigns.launch("signup", account) return account diff --git a/src/backend/campaigns.py b/src/backend/campaigns.py index 746870e3..35f55b54 100644 --- a/src/backend/campaigns.py +++ b/src/backend/campaigns.py @@ -6,12 +6,12 @@ from .decorators import * from .misc import Object class Campaigns(Object): - async def launch_manually(self, uid): + async def launch_manually(self, name, uid): account = self.backend.accounts.get_by_uid(uid) if account: - self.launch(account) + self.launch(name, account) - def launch(self, account): + def launch(self, name, account): logging.debug("Launching all campaigns for %s" % account) # Update old timestamps first @@ -22,9 +22,10 @@ class Campaigns(Object): # Launch all campaigns self.db.execute("INSERT INTO campaign_emails(account_uid, template, \ - launch_at, repeat_after, groups ) \ + launch_at, repeat_after) \ SELECT %s, template, COALESCE(launch_at, CURRENT_TIMESTAMP + launch_after), \ - repeat_after, groups FROM campaign_templates", account.uid) + repeat_after FROM campaign_templates WHERE name = %s", + account.uid, name) def _get_campaign_emails(self, query, *args): res = self.db.query(query, *args)