Resolved conflicts

apache · Oct 5, 2016 · 2a6e30b · 2a6e30b
1 parent 70816a7
commit 2a6e30b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/caravel/views.py b/caravel/views.py
@@ -1958,6 +1958,10 @@ def fetch_datasource_metadata(self):
         if not self.datasource_access(datasource):
             return json_error_response(DATASOURCE_ACCESS_ERR)
 
+        order_by_choices = []
+        for s in sorted(datasource.num_cols):
+            order_by_choices.append(s + ' [asc]')
+            order_by_choices.append(s + ' [desc]')
         column_opts = {
             "groupby_cols": datasource.groupby_column_names,
             "metrics": datasource.metrics_combo,