From 103bf176edbbd6cb25fc49a9c869d5913ae8c031 Mon Sep 17 00:00:00 2001
From: Khanh Ngo <k@ndk.name>
Date: Tue, 17 Dec 2019 13:34:52 +0700
Subject: [PATCH] Fix dashboard domain sorting

---
 powerdnsadmin/routes/dashboard.py             | 4 ++--
 powerdnsadmin/templates/dashboard.html        | 2 --
 powerdnsadmin/templates/dashboard_domain.html | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/powerdnsadmin/routes/dashboard.py b/powerdnsadmin/routes/dashboard.py
index be94a93..bae0f1e 100644
--- a/powerdnsadmin/routes/dashboard.py
+++ b/powerdnsadmin/routes/dashboard.py
@@ -43,9 +43,9 @@ def domains_custom(boxId):
 
     columns = [
         Domain.name, Domain.dnssec, Domain.type, Domain.serial, Domain.master,
-        Domain.account
+        Domain.account_id
     ]
-    # History.created_on.desc()
+
     order_by = []
     for i in range(len(columns)):
         column_index = request.args.get("order[{0}][column]".format(i))
diff --git a/powerdnsadmin/templates/dashboard.html b/powerdnsadmin/templates/dashboard.html
index 295a3f2..4ba42e6 100755
--- a/powerdnsadmin/templates/dashboard.html
+++ b/powerdnsadmin/templates/dashboard.html
@@ -169,8 +169,6 @@
 {% endblock %}
 {% block extrascripts %}
 <script>
-    PDNS_VERSION = '{{ SETTING.get("pdns_version") }}';
-
 //SYBPATCH START//
     function setUpDomainList(id ,url){
         $(id).DataTable({
diff --git a/powerdnsadmin/templates/dashboard_domain.html b/powerdnsadmin/templates/dashboard_domain.html
index 4eb88ff..9fcc4de 100644
--- a/powerdnsadmin/templates/dashboard_domain.html
+++ b/powerdnsadmin/templates/dashboard_domain.html
@@ -19,12 +19,12 @@
 {% endmacro %}
 
 {% macro master(domain) %}
-    {% if domain.master == '[]'%}N/A{% else %}{{ domain.master|display_master_name }}{% endif %}
+    {% if domain.master == '[]'%}-{% else %}{{ domain.master|display_master_name }}{% endif %}
 {% endmacro %}
 
 {% macro account(domain) %}
     {% if current_user.role.name in ['Administrator', 'Operator'] %}
-      {% if domain.account_description != "" %}{{ domain.account.description }} {% endif %}[{{ domain.account.name }}]
+      {{ domain.account.name if domain.account else '-' }}
     {% endif %}
 {% endmacro %}