Merge branch 'master' into fix/elastic#1962

stormpython · Jan 15, 2015 · b695748 · b695748
2 parents 85df0f2 + 7fa71b9
commit b695748
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/kibana/components/agg_types/controls/raw_json.html b/src/kibana/components/agg_types/controls/raw_json.html
@@ -7,5 +7,6 @@
       ng-model="agg.params.json"
       validate-json
       ></textarea>
+      <small>Any JSON formatted properties you add here will be merged with the elasticsearch aggregation definition for this section. For example <i>shard_size</i> on a <i>terms</i> aggregation</small>
   </p>
 </div>
diff --git a/src/kibana/plugins/discover/controllers/discover.js b/src/kibana/plugins/discover/controllers/discover.js
@@ -5,6 +5,7 @@ define(function (require) {
   var ConfigTemplate = require('utils/config_template');
   var onlyDisabled = require('components/filter_bar/lib/onlyDisabled');
   var filterManager = require('components/filter_manager/filter_manager');
+  var getSort = require('components/doc_table/lib/get_sort');
 
   var interval = require('utils/interval');
   var datemath = require('utils/datemath');
@@ -86,7 +87,7 @@ define(function (require) {
     function getStateDefaults() {
       return {
         query: $scope.searchSource.get('query') || '',
-        sort: savedSearch.sort || [],
+        sort:  _.pairs(getSort(savedSearch.sort, $scope.searchSource.get('index'))).pop(),
         columns: savedSearch.columns || ['_source'],
         index: $scope.searchSource.get('index').id || config.get('defaultIndex'),
         interval: 'auto',