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

fix admin tasks panel

Browse source
This commit is contained in:
deflax 2018-02-02 01:08:29 +02:00
parent 14eb0a9452
commit 6f3530095f
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/templates/admin/admin_cloud.html
View file

@ -1,3 +1,5 @@
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_deployments') }}','_self')"><span class="glyphicon glyphicon-hdd" aria-hidden="true"></span> Deployments</button>
<button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_servers') }}','_self')"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Servers</button> <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_servers') }}','_self')"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Servers</button>
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_deployments') }}','_self')"><span class="glyphicon glyphicon-hdd" aria-hidden="true"></span> Deploys</button>
<button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_addresses') }}','_self')"><span class="glyphicon glyphicon-tag" aria-hidden="true"></span> Addresses</button> <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_addresses') }}','_self')"><span class="glyphicon glyphicon-tag" aria-hidden="true"></span> Addresses</button>
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_services') }}','_self')"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Services</button>

3
app/templates/admin/admin_misc.html
View file

@ -1,4 +1,3 @@
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_services') }}','_self')"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Services</button>
<button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_domains') }}','_self')"><span class="glyphicon glyphicon-home" aria-hidden="true"></span> Domains</button>
<button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_users') }}','_self')"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> Users</button> <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_users') }}','_self')"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> Users</button>
<button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_transactions') }}','_self')"><span class="glyphicon glyphicon-btc" aria-hidden="true"></span> Transactions</button> <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_transactions') }}','_self')"><span class="glyphicon glyphicon-btc" aria-hidden="true"></span> Transactions</button>
<button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_archive') }}','_self')"><span class="glyphicon glyphicon-book" aria-hidden="true"></span> Archive</button>

4
app/templates/admin/admin_tasks.html
View file

@ -1,4 +1,4 @@
<div class="col-md-6"> <div class="col-md-7">
<div class="panel panel-warning" id="prxadmincloud"> <div class="panel panel-warning" id="prxadmincloud">
<div class="panel-heading">Cloud Manager</div> <div class="panel-heading">Cloud Manager</div>
<div class="panel-body"> <div class="panel-body">
@ -7,7 +7,7 @@
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-5">
<div class="panel panel-warning" id="prxadminmisc"> <div class="panel panel-warning" id="prxadminmisc">
<div class="panel-heading">Misc</div> <div class="panel-heading">Misc</div>
<div class="panel-body"> <div class="panel-body">

3
app/vmanager/routes.py
View file

@ -184,6 +184,9 @@ def remove(unit_id=0):
try: try:
#pubvlans depends on deploy as foreign key so delete them first #pubvlans depends on deploy as foreign key so delete them first
for pubvlan in deploy.inv_pubvlans: for pubvlan in deploy.inv_pubvlans:
pubvlan.pubaddr.pubvlan_id = None
pubvlan.pubaddr.user_id = None
db.session.commit()
db.session.delete(pubvlan) db.session.delete(pubvlan)
db.session.commit() db.session.commit()