From e0a2d03f447e1eeac8afcf6bd51a5d5f37798c8c Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Wed, 15 Jun 2022 15:01:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E9=80=9A=E7=9F=A5bug=20(#8404)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng626 <1304903146@qq.com> --- apps/perms/notifications.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/perms/notifications.py b/apps/perms/notifications.py index 4a7baf318..a6316eb8a 100644 --- a/apps/perms/notifications.py +++ b/apps/perms/notifications.py @@ -12,13 +12,13 @@ class PermedAssetsWillExpireUserMsg(UserMessage): def __init__(self, user, assets, day_count=0): super().__init__(user) self.assets = assets - self.count = day_count + self.day_count = day_count def get_html_msg(self) -> dict: subject = _("You permed assets is about to expire") context = { 'name': self.user.name, - 'day_count': self.day_count, + 'count': self.day_count, 'items': [str(asset) for asset in self.assets], 'item_type': _("permed assets"), 'show_help': True @@ -44,7 +44,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage): super().__init__(user) self.perms = perms self.org = org - self.count = day_count + self.day_count = day_count def get_items_with_url(self): items_with_url = [] @@ -62,7 +62,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage): subject = _("Asset permissions is about to expire") context = { 'name': self.user.name, - 'day_count': self.day_count, + 'count': self.day_count, 'items_with_url': items_with_url, 'item_type': _('asset permissions of organization {}').format(self.org) } @@ -88,13 +88,13 @@ class PermedAppsWillExpireUserMsg(UserMessage): def __init__(self, user, apps, day_count=0): super().__init__(user) self.apps = apps - self.count = day_count + self.day_count = day_count def get_html_msg(self) -> dict: subject = _("Your permed applications is about to expire") context = { 'name': self.user.name, - 'day_count': self.day_count, + 'count': self.day_count, 'item_type': _('permed applications'), 'items': [str(app) for app in self.apps] } @@ -119,7 +119,7 @@ class AppPermsWillExpireForOrgAdminMsg(UserMessage): super().__init__(user) self.perms = perms self.org = org - self.count = day_count + self.day_count = day_count def get_items_with_url(self): items_with_url = [] @@ -134,6 +134,7 @@ class AppPermsWillExpireForOrgAdminMsg(UserMessage): subject = _('Application permissions is about to expire') context = { 'name': self.user.name, + 'count': self.day_count, 'item_type': _('application permissions of organization {}').format(self.org), 'items_with_url': items }