diff options
author | Hongyuan Ma | 2018-08-01 18:23:09 +0000 |
---|---|---|
committer | Hongyuan Ma | 2018-08-01 18:23:09 +0000 |
commit | 7166c3fc94a50ed1788f6c00a955c79db720142d (patch) | |
tree | cc36271457f969c765e30c4020e37e67e564c29d | |
parent | 4a1de5e0c2e05793ac849c3439b4d0f517f3f06c (diff) |
modify email format
-rw-r--r-- | web/apps/users/admin.py | 17 | ||||
-rw-r--r-- | web/apps/users/models.py | 10 | ||||
-rw-r--r-- | web/pgperffarm/settings.py | 4 |
3 files changed, 18 insertions, 13 deletions
diff --git a/web/apps/users/admin.py b/web/apps/users/admin.py index 8d675c2..bf81a3e 100644 --- a/web/apps/users/admin.py +++ b/web/apps/users/admin.py @@ -10,7 +10,7 @@ from .models import UserMachine class UserMachineAdmin(admin.ModelAdmin): - list_display = ('alias', 'machine_sn', 'state') + list_display = ('id', 'alias', 'state', 'machine_sn', 'machine_secret', ) list_filter = ('state',) actions = ['approve_machine'] @@ -22,22 +22,25 @@ class UserMachineAdmin(admin.ModelAdmin): for machine in queryset: ret = machine.approve_machine() - # ret = {"is_success": True, "alias": 'alias', "secrct": 'machine_secret', "email":user_email} + # ret = {"is_success": True, "alias": self.alias.name, "secret": self.machine_secret, "system": system, "compiler":compiler,"email":user_email} if ret['is_success']: success += 1 # send email to notice user - content = "The machine you have applied for has been approved.\n\ + content = "Greetings,\n\ +\ +The machine you have applied for has been approved.\n\ Here is the information about it: \n \ \n \ alias: %s\n \ secret: %s\n \ +system: %s\n \ +compiler: %s\n \ \n \ Regards,\n \ -PG PERF FARM" % (ret['alias'], ret['secret']) - # ret['alias'] + ': ' + ret['secret'] +PG PERF FARM" % (ret['alias'], ret['secret'], ret['system'], ret['compiler']) - send_mail('[PG PERF FARM]Machine Approval Notice', content, settings.EMAIL_HOST_USER, [ret['email']], + send_mail('[PG PERF FARM<test mail>]Machine Approval Notice', content, settings.EMAIL_HOST_USER, [ret['email']], fail_silently=False) else: @@ -51,7 +54,7 @@ PG PERF FARM" % (ret['alias'], ret['secret']) "Total: %s ,Success: %s ,Error: %s. Please make sure there are enough unused aliases." % ( total, success, error)) - approve_machine.short_description = u'Approve Machine(Modify the state to active, generate machine_sn, machine_secret, and assign an alias)' + approve_machine.short_description = u'Approve Machine(Modify the state to active, generate machine_sn, machine_secret and assign an alias)' admin.site.register(UserMachine, UserMachineAdmin) diff --git a/web/apps/users/models.py b/web/apps/users/models.py index 4e05a47..669a419 100644 --- a/web/apps/users/models.py +++ b/web/apps/users/models.py @@ -41,10 +41,10 @@ class UserMachine(models.Model): """ user machine """ - machine_sn = models.CharField(max_length=16, verbose_name="machine sn") - machine_secret = models.CharField(max_length=32, verbose_name="machine secret") + machine_sn = models.CharField(max_length=16, blank=True, default='',verbose_name="machine sn") + machine_secret = models.CharField(max_length=32, blank=True, default='', verbose_name="machine secret") machine_owner = models.ForeignKey(UserProfile) - alias = models.ForeignKey(Alias,blank=True, default=None, verbose_name="alias", help_text="alias") + alias = models.ForeignKey(Alias,blank=True, null=True, verbose_name="alias", help_text="alias") os_name = models.CharField(max_length=32, verbose_name="operation system name") os_version = models.CharField(max_length=32, verbose_name="operation system version") comp_name = models.CharField(max_length=32, verbose_name="compiler name") @@ -94,4 +94,6 @@ class UserMachine(models.Model): # serializer = JWTUserProfileSerializer(user) print(self.machine_owner.email) user_email = self.machine_owner.email - return {"is_success": True, "alias": self.alias.name, "secret": self.machine_secret, "email":user_email}
\ No newline at end of file + system = self.os_name + ' ' + self.os_version + compiler = self.comp_name + ' ' + self.comp_version + return {"is_success": True, "alias": self.alias.name, "secret": self.machine_secret, "system": system, "compiler":compiler,"email":user_email}
\ No newline at end of file diff --git a/web/pgperffarm/settings.py b/web/pgperffarm/settings.py index e572856..76e7845 100644 --- a/web/pgperffarm/settings.py +++ b/web/pgperffarm/settings.py @@ -223,6 +223,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_USE_SSL = True EMAIL_HOST = 'smtp.163.com' EMAIL_PORT = 465 -EMAIL_HOST_USER = '' -EMAIL_HOST_PASSWORD = '' # individual password +# EMAIL_HOST_USER = '' +# EMAIL_HOST_PASSWORD = '' # individual password DEFAULT_FROM_EMAIL = EMAIL_HOST_USER |