From 5390a7a784815e3a7faf45f8d6219d6605f9a2d5 Mon Sep 17 00:00:00 2001
From: deflax <daniel@deflax.net>
Date: Tue, 1 Aug 2017 14:27:32 +0300
Subject: [PATCH] craete seed function phase 3

---
 app/admin/routes.py                  | 2 +-
 app/templates/admin/admin_tasks.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin/routes.py b/app/admin/routes.py
index a734bb7..b39e77c 100644
--- a/app/admin/routes.py
+++ b/app/admin/routes.py
@@ -69,7 +69,7 @@ def list_cancelled():
 @login_required
 @admin_required
 def list_addresses():
-    alladdresses = Address.query.filter_by(cancelled=False).order_by(Address.ip.asc()).all()
+    alladdresses = Address.query.order_by(Address.ip.asc()).all()
     return render_template('admin/list_addresses.html', addresses=alladdresses)
 
 @admin.route("/addr2pool", methods=['GET', 'POST'])
diff --git a/app/templates/admin/admin_tasks.html b/app/templates/admin/admin_tasks.html
index 4495bed..7213dfc 100644
--- a/app/templates/admin/admin_tasks.html
+++ b/app/templates/admin/admin_tasks.html
@@ -7,9 +7,9 @@
     <button class="btn btn-success btn-lg" 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-lg" 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-lg" onclick="window.open('{{ url_for('admin.list_domains') }}','_self')"><span class="glyphicon glyphicon-home" aria-hidden="true"></span> Domains</button>
+    <button class="btn btn-danger btn-lg" onclick="window.open('{{ url_for('admin.list_cancelled') }}', '_self')"><span class="glyphicon glyphicon-cd" aria-hidden="true"></span> Recycle Bin</button>
     <button class="btn btn-primary btn-lg" 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-lg" onclick="window.open('{{ url_for('admin.list_transactions') }}','_self')"><span class="glyphicon glyphicon-usd" aria-hidden="true"></span> Transactions</button>
-    <button class="btn btn-danger btn-lg" onclick="alert('Как ще си събираш зъбите със счупени ръце?')"><span class="glyphicon glyphicon-cd" aria-hidden="true"></span> Nothing</button>
     </center>
   </div>
   </div>