undersys/proxadmin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix some bugs

Browse source
This commit is contained in:
deflax 2018-02-01 02:13:30 +02:00
parent 61a1839ea6
commit 91d8a14829
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/vmanager/routes.py
View file

@ -6,7 +6,7 @@ from . import vmanager
from .forms import CreateForm, ActivateForm from .forms import CreateForm, ActivateForm
from .. import db, csrf from .. import db, csrf
from ..email import send_email from ..email import send_email
from ..models import User, Permission, Transaction, Deployment, Service, Region, Server, Address, Domain, contact_proxmaster from ..models import User, Permission, Transaction, Deployment, PubVLAN, Service, Region, Server, Address, Domain, contact_proxmaster
from ..decorators import admin_required, permission_required from ..decorators import admin_required, permission_required
import json import json
@ -202,7 +202,7 @@ def remove(unit_id=0):
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
flash('Cannot delete machine {}'.format(unit_id)) flash('Cannot delete machine {}'.format(unit_id))
return redirect(url_for('admin.list_recyclebin')) return redirect(url_for('admin.list_archive'))
else: else:
current_app.logger.warning('Deployment id:{} is protected! Cannot be removed'.format(unit_id)) current_app.logger.warning('Deployment id:{} is protected! Cannot be removed'.format(unit_id))
else: else: