diff --git a/src/kibana/apps/dashboard/index.html b/src/kibana/apps/dashboard/index.html index f55f5c0470baa1..36844d1d6466a7 100644 --- a/src/kibana/apps/dashboard/index.html +++ b/src/kibana/apps/dashboard/index.html @@ -2,14 +2,9 @@ - + {{dash.title}} - - - - - diff --git a/src/kibana/apps/dashboard/index.js b/src/kibana/apps/dashboard/index.js index c14b759446b679..c9c4d4c2e505e5 100644 --- a/src/kibana/apps/dashboard/index.js +++ b/src/kibana/apps/dashboard/index.js @@ -80,7 +80,7 @@ define(function (require) { if (query === void 0) return; if (_.isString(query) && query.length > 0) { - query = {wildcard: {title: query + '*'}}; + query = {wildcard: {title: '*' + query + '*'}}; } else { query = {match_all: {}}; } @@ -125,13 +125,12 @@ define(function (require) { .type('dashboard') .id($scope.dash.title); - // TODO: If a dashboard is deleted from kibana4-int, and we try to save another dashboard with - // the same name later, it fails due to a version conflict. doc.doIndex({ title: dash.title, panelsJSON: JSON.stringify($scope.gridControl.serializeGrid()) }) .then(function () { + notify.info('Saved Dashboard as "' + $scope.dash.title + '"'); if ($scope.dash.title !== $routeParams.id) { $location.url('/dashboard/' + encodeURIComponent($scope.dash.title)); } diff --git a/src/kibana/apps/dashboard/partials/load_dashboard.html b/src/kibana/apps/dashboard/partials/load_dashboard.html index e91bee2d919a59..ea45c6b801b6fb 100644 --- a/src/kibana/apps/dashboard/partials/load_dashboard.html +++ b/src/kibana/apps/dashboard/partials/load_dashboard.html @@ -2,7 +2,7 @@ Filter Dashboards - + diff --git a/src/kibana/utils/mixins.js b/src/kibana/utils/mixins.js index 549bcc6bcb1b92..f2601cd80c21d0 100644 --- a/src/kibana/utils/mixins.js +++ b/src/kibana/utils/mixins.js @@ -22,7 +22,9 @@ define(function (require) { } return array; }, - flattenWith: function (dot, nestedObj) { + // NOTE: The flatten behavior here works if you don't need to keep a reference to the + // original value + flattenWith: function (dot, nestedObj, keepArrays) { var key; // original key var stack = []; // track key stack var flatObj = {};