From f222aeae14c8b24537d5840d1b7e64604a6951c9 Mon Sep 17 00:00:00 2001 From: deflax Date: Sat, 15 Jul 2017 07:28:04 +0300 Subject: [PATCH] activate functions bugs --- app/main/routes.py | 4 +++- app/vmanager/routes.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/main/routes.py b/app/main/routes.py index 7390c86..2f8c935 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -5,7 +5,9 @@ from flask_sqlalchemy import get_debug_queries from . import main from .. import db from ..email import send_email -from ..models import User, Permission, Deployment, Service, Region, Address, Domain +from ..models import User, Permission, Deployment, Service, Region, Address, Domain, contact_proxmaster + +import base64 @main.after_app_request def after_request(response): diff --git a/app/vmanager/routes.py b/app/vmanager/routes.py index 2838cb9..8244ab0 100644 --- a/app/vmanager/routes.py +++ b/app/vmanager/routes.py @@ -143,7 +143,7 @@ def activate(itemid=0): if current_user.wallet < total: flash('Insufficient Funds') return redirect(url_for('uinvoice.transactions')) - current_app.logger.info('[{}] Charge deployments: {}'.format(current_user.email, inventory)) + current_app.logger.info('[{}] Charge deployment: {}'.format(current_user.email, deploy.machine_id)) today = datetime.utcnow() current_app.logger.info(form.period.data) @@ -153,10 +153,10 @@ def activate(itemid=0): deploy.period = form.period.data deploy.daysleft = form.period.data * daysleft.days deploy.warning = False - deploy.active = True + deploy.enabled = True db.session.commit() - transaction = Transaction(user_id=int(current_user.pid), description='Deployment {} activated for {} month(s)', value=-total) + transaction = Transaction(user_id=int(current_user.pid), description='Deployment {} activated for {} month(s)'.format(deploy.machine_alias, form.period.data), value=-total) db.session.add(transaction) db.session.commit()