Merge branch 'sort_columns_in_grid_settings' of https://github.com/vi…

…th/Griddle into vith-sort_columns_in_grid_settings
DynamicTyped · Mar 26, 2015 · eda8160 · eda8160
2 parents 8b180f4 + 4678265
commit eda8160
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/scripts/columnProperties.js b/scripts/columnProperties.js
@@ -39,23 +39,30 @@ class ColumnProperties{
     return meta.hasOwnProperty(propertyName) ? meta[propertyName] : defaultValue;
   }
 
-  getColumns(){
+  orderColumns(cols) {
     var ORDER_MAX = 100;
-    //if we didn't set default or filter
-    var filteredColumns = this.filteredColumns.length === 0 ? this.allColumns : this.filteredColumns;
-
-    filteredColumns = _.difference(filteredColumns, this.metadataColumns);
 
-    filteredColumns = _.sortBy(filteredColumns, (item) => {
+    var orderedColumns = _.sortBy(cols, (item) => {
         var metaItem = _.findWhere(this.columnMetadata, {columnName: item});
 
         if (typeof metaItem === 'undefined' || metaItem === null || isNaN(metaItem.order)){
             return ORDER_MAX;
         }
-
+        
         return metaItem.order;
     });
 
+    return orderedColumns;
+  }
+
+  getColumns(){
+    //if we didn't set default or filter
+    var filteredColumns = this.filteredColumns.length === 0 ? this.allColumns : this.filteredColumns;
+
+    filteredColumns = _.difference(filteredColumns, this.metadataColumns);
+
+    filteredColumns = this.orderColumns(filteredColumns);
+
     return filteredColumns;
   }
 }

diff --git a/scripts/griddle.jsx b/scripts/griddle.jsx
@@ -583,6 +583,9 @@ var Griddle = React.createClass({
         // Grab the column keys from the first results
         keys = _.keys(_.omit(results[0], meta));
 
+        // sort keys by order
+        keys = this.columnSettings.orderColumns(keys);
+
         // Grab the current and max page values.
         var currentPage = this.getCurrentPage();
         var maxPage = this.getCurrentMaxPage();