Merge pull request #14 from CodeForAfrica/fix-total-desc

[Bug] Fix get_stat_data ordering by descending total
CodeForAfrica · Aug 5, 2019 · 4d3af6c · 4d3af6c
2 parents 3275ae7 + a47e033
commit 4d3af6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -21,7 +21,6 @@
     'django-pipeline>=1.6.4',
     'django-sass-processor>=0.5.4',
     'ecdsa>=0.11',
-    'futures>=3.0.4',
     'libsass>=0.13.1',
     'paramiko>=1.12.3,<2',
     'psycopg2>=2.5.2',

diff --git a/wazimap/models/data.py b/wazimap/models/data.py
@@ -35,7 +35,7 @@
 from itertools import groupby
 from wazimap.data.base import Base
 from wazimap.data.utils import get_session, capitalize, percent as p, add_metadata, current_context
-from sqlalchemy import Column, String, Table, or_, and_, func
+from sqlalchemy import Column, String, Table, or_, and_, func, text
 from sqlalchemy.exc import NoSuchTableError
 from sqlalchemy.orm import class_mapper
 import sqlalchemy.types
@@ -855,7 +855,7 @@ def get_rows_for_geo(self, geo, session, fields=None, order_by=None, only=None,
 
             if attr == 'total':
                 if is_desc:
-                    attr = attr + ' DESC'
+                    attr = text(attr + ' DESC')
             else:
                 attr = getattr(db_model, attr)
                 if is_desc: