From 093875c62dabafed42de04c05f06f041ebaea034 Mon Sep 17 00:00:00 2001 From: Andrew Thanalertvisuti Date: Tue, 27 Aug 2019 12:45:38 +0700 Subject: [PATCH] Release 1.6.25 (#348) * Remove the double uri encoding in Filter service. (#343) * Change version to v1.6.25-alpha * Fix rounding issue relative mode timepicker (#346) * Change version to v1.6.25-alpha * Remove time unit rounding in the relative mode of time picker. * Update README. Changed the version number to 1.6.25. --- README.md | 9 +++------ src/app/panels/timepicker/module.js | 4 ++-- src/app/partials/dasheditor.html | 2 +- src/app/services/filterSrv.js | 6 +++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 17b273f54..47001b3b9 100644 --- a/README.md +++ b/README.md @@ -17,14 +17,11 @@ Pull the repo from the `release` branch for production deployment; version x.y.z `fusion` branch is used for Lucidworks Fusion release. The code base and features are the same as `develop`. The main difference is in the configuration. -## Banana 1.6.24 +## Banana 1.6.25 This release includes the following bug fixes and improvement: -1. Fix the filter panel where we cannot add more than one filer when clicking on the plus icon. -1. Fix the Sankey panel. [#338](https://github.com/lucidworks/banana/pull/338) -1. Allow the Terms panel to have a horizontal bar chart. [#338](https://github.com/lucidworks/banana/pull/338) -1. Add Sankey hover/highlight effect. [#340](https://github.com/lucidworks/banana/pull/340) -1. Force diagram numerical node names fix. [#340](https://github.com/lucidworks/banana/pull/340) +1. Remove the double URI encoding issue in Filter service. [#343](https://github.com/lucidworks/banana/pull/343) +1. Fix rounding issue in the relative mode of the Timepicker panel. [#346](https://github.com/lucidworks/banana/pull/346) ## Older Release Notes diff --git a/src/app/panels/timepicker/module.js b/src/app/panels/timepicker/module.js index 8da27cc35..d8d694d79 100644 --- a/src/app/panels/timepicker/module.js +++ b/src/app/panels/timepicker/module.js @@ -305,8 +305,8 @@ function (angular, app, _, moment, kbn, $) { timeUnit = 'YEAR'; break; } - filterTime.from = 'NOW/' + timeUnit + '-' + timeNumber + timeUnit; - filterTime.to = 'NOW/' + timeUnit + '%2B1' + timeUnit; + filterTime.from = 'NOW-' + timeNumber + timeUnit; + filterTime.to = 'NOW%2B1' + timeUnit; // Add Date objects representation of from and to, for use with histogram panel // where it needs Date objects for plotting x-axis on a chart. filterTime.fromDateObj = moment().subtract(timeShorthand,timeNumber).toDate(); diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html index 7ae0e0375..b75af50d9 100755 --- a/src/app/partials/dasheditor.html +++ b/src/app/partials/dasheditor.html @@ -39,7 +39,7 @@ ng-options="f for f in ['dark','light']">
- Banana v1.6.24 + Banana v1.6.25
diff --git a/src/app/services/filterSrv.js b/src/app/services/filterSrv.js index cccd19ff7..63cb394e8 100755 --- a/src/app/services/filterSrv.js +++ b/src/app/services/filterSrv.js @@ -240,11 +240,11 @@ define([ } } else if (v.type === 'querystring') { if (v.mandate === 'must') { - filter_fq = filter_fq + '&fq=' + encodeURIComponent(v.query); + filter_fq = filter_fq + '&fq=' + v.query; } else if (v.mandate === 'mustNot') { - filter_fq = filter_fq + '&fq=-' + encodeURIComponent(v.query); + filter_fq = filter_fq + '&fq=-' + v.query; } else if (v.mandate === 'either') { - filter_either.push(encodeURIComponent(v.query)); + filter_either.push(v.query); } } else if (v.type === 'range') { if (v.mandate === 'must') {