Merge pull request getredash#436 from EverythingMe/fix_ui

Fix: sorting not working for columns with special characters
dieface · May 19, 2015 · e6ba624 · e6ba624
2 parents a1c8ef9 + f45281b
commit e6ba624
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/rd_ui/app/scripts/ng_smart_table.js b/rd_ui/app/scripts/ng_smart_table.js
@@ -381,7 +381,10 @@
             function sortDataRow(array, column) {
                 var sortAlgo = (scope.sortAlgorithm && angular.isFunction(scope.sortAlgorithm)) === true ? scope.sortAlgorithm : filter('orderBy');
                 if (column) {
-                    return arrayUtility.sort(array, sortAlgo, column.sortPredicate, column.reverse);
+                    var predicate = function(o) {
+                        return o[column.sortPredicate];
+                    };
+                    return arrayUtility.sort(array, sortAlgo, predicate, column.reverse);
                 } else {
                     return array;
                 }

diff --git a/redash/tasks.py b/redash/tasks.py
@@ -256,7 +256,7 @@ def execute_query(self, query, data_source_id, metadata):
 
         logging.debug("Annotation: %s", annotation)
 
-        annotated_query = "/* {} */ {}".format(annotation, query)
+        annotated_query = u"/* {} */ {}".format(annotation, query)
     else:
         annotated_query = query