mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

minor fix

Browse source
This commit is contained in:
Arvind Tiwari 2017-09-27 03:28:06 +05:30
commit f4b6b38522
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datacenterlight/tasks.py
View file

@ -128,7 +128,7 @@ def create_vm_task(self, vm_template_id, user, specs, template,
'storage': specs.get('disk_size'), 'storage': specs.get('disk_size'),
'price': specs.get('price'), 'price': specs.get('price'),
'template': template.get('name'), 'template': template.get('name'),
'vm_name': vm['name'], 'vm_name': vm.get('name'),
'vm_id': vm['vm_id'], 'vm_id': vm['vm_id'],
'order_id': order.id 'order_id': order.id
} }

2
hosting/templates/hosting/emails/new_booked_vm.html
View file

@ -19,7 +19,7 @@
</tr> </tr>
<tr> <tr>
<td style="padding-top: 15px; padding-left: 30px; padding-right: 30px;"> <td style="padding-top: 15px; padding-left: 30px; padding-right: 30px;">
<h1 style="font-family: Lato, Arial, sans-serif; font-size: 25px; font-weight: 400; margin: 0;">{% blocktrans %}Your New VM {{vm_name}}{% endblocktrans %}</h1> <h1 style="font-family: Lato, Arial, sans-serif; font-size: 25px; font-weight: 400; margin: 0;">{% blocktrans %}Your New VM {{ vm_name }}{% endblocktrans %}</h1>
</td> </td>
</tr> </tr>
<tr> <tr>

1
hosting/views.py
View file

@ -267,7 +267,6 @@ class SignupValidatedView(SignupValidateView):
section_title = _('Account activation') section_title = _('Account activation')
user = CustomUser.objects.filter( user = CustomUser.objects.filter(
validation_slug=self.kwargs['validate_slug']).first() validation_slug=self.kwargs['validate_slug']).first()
# pre_valid = user.validated
if validated: if validated:
message = '{account_activation_string} <br /> {login_string} {lurl}.'.format( message = '{account_activation_string} <br /> {login_string} {lurl}.'.format(
account_activation_string=_( account_activation_string=_(