merge v3

apps/perms/notifications.py

@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin
 from django.utils.translation import ugettext as _
 from django.template.loader import render_to_string
 
@@ -10,7 +13,7 @@ class PermedAssetsWillExpireUserMsg(UserMessage):
     def __init__(self, user, assets, day_count=0):
         super().__init__(user)
         self.assets = assets
-        self.day_count = day_count
+        self.day_count = _('today') if day_count == 0 else day_count
 
     def get_html_msg(self) -> dict:
         subject = _("You permed assets is about to expire")
@@ -42,7 +45,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage):
         super().__init__(user)
         self.perms = perms
         self.org = org
-        self.day_count = day_count
+        self.day_count = _('today') if day_count == 0 else day_count
 
     def get_items_with_url(self):
         items_with_url = []
@@ -50,7 +53,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage):
             url = js_reverse(
                 'perms:asset-permission-detail',
                 kwargs={'pk': perm.id}, external=True,
-                api_to_ui=True
+                api_to_ui=True, is_console=True
             ) + f'?oid={perm.org_id}'
             items_with_url.append([perm.name, url])
         return items_with_url
@@ -60,7 +63,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage):
         subject = _("Asset permissions is about to expire")
         context = {
             'name': self.user.name,
-            'count': self.day_count,
+            'count': str(self.day_count),
             'items_with_url': items_with_url,
             'item_type': _('asset permissions of organization {}').format(self.org)
         }
@@ -80,3 +83,81 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage):
         perms = AssetPermission.objects.all()[:10]
         org = Organization.objects.first()
         return cls(user, perms, org)
+<<<<<<< HEAD
+=======
+
+
+class PermedAppsWillExpireUserMsg(UserMessage):
+    def __init__(self, user, apps, day_count=0):
+        super().__init__(user)
+        self.apps = apps
+        self.day_count = _('today') if day_count == 0 else day_count
+
+    def get_html_msg(self) -> dict:
+        subject = _("Your permed applications is about to expire")
+        context = {
+            'name': self.user.name,
+            'count': str(self.day_count),
+            'item_type': _('permed applications'),
+            'items': [str(app) for app in self.apps]
+        }
+        message = render_to_string('perms/_msg_permed_items_expire.html', context)
+        return {
+            'subject': subject,
+            'message': message
+        }
+
+    @classmethod
+    def gen_test_msg(cls):
+        from users.models import User
+        from applications.models import Application
+
+        user = User.objects.first()
+        apps = Application.objects.all()[:10]
+        return cls(user, apps)
+
+
+class AppPermsWillExpireForOrgAdminMsg(UserMessage):
+    def __init__(self, user, perms, org, day_count=0):
+        super().__init__(user)
+        self.perms = perms
+        self.org = org
+        self.day_count = _('today') if day_count == 0 else day_count
+
+    def get_items_with_url(self):
+        items_with_url = []
+        for perm in self.perms:
+            url = js_reverse(
+                'perms:application-permission-detail',
+                kwargs={'pk': perm.id}, external=True,
+                api_to_ui=True, is_console=True
+            ) + f'?oid={perm.org_id}'
+            items_with_url.append([perm.name, url])
+        return items_with_url
+
+    def get_html_msg(self) -> dict:
+        items = self.get_items_with_url()
+        subject = _('Application permissions is about to expire')
+        context = {
+            'name': self.user.name,
+            'count': str(self.day_count),
+            'item_type': _('application permissions of organization {}').format(self.org),
+            'items_with_url': items
+        }
+        message = render_to_string('perms/_msg_item_permissions_expire.html', context)
+        return {
+            'subject': subject,
+            'message': message
+        }
+
+    @classmethod
+    def gen_test_msg(cls):
+        from users.models import User
+        from perms.models import ApplicationPermission
+        from orgs.models import Organization
+
+        user = User.objects.first()
+        perms = ApplicationPermission.objects.all()[:10]
+        org = Organization.objects.first()
+        return cls(user, perms, org)
+>>>>>>> origin