You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2022/06/28 17:21:49 UTC
[solr] branch branch_9x updated: SOLR-16142: Fix Admin UI's spatial parameter generation. (#886)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new d89d9365d94 SOLR-16142: Fix Admin UI's spatial parameter generation. (#886)
d89d9365d94 is described below
commit d89d9365d94da4fd5105df6deed1af694b273764
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Jun 28 18:06:08 2022 +0100
SOLR-16142: Fix Admin UI's spatial parameter generation. (#886)
(cherry picked from commit 0bd8c4d9835827c4a31c3b1a99a368028535026c)
---
solr/CHANGES.txt | 2 ++
solr/webapp/web/js/angular/controllers/query.js | 2 +-
solr/webapp/web/partials/query.html | 6 +++---
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4b925080c7a..f0ba0d570d6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -69,6 +69,8 @@ Bug Fixes
* SOLR-16241: Fix JettyConfig.builder(JettyConfig) to correctly copy all attributes (hossman)
+* SOLR-16142: Fix Admin UI's spatial parameter generation. (Arsal Jalib, Christine Poerschke)
+
Other Changes
---------------------
* SOLR-15897: Remove <jmx/> from all unit test solrconfig.xml files. (Eric Pugh)
diff --git a/solr/webapp/web/js/angular/controllers/query.js b/solr/webapp/web/js/angular/controllers/query.js
index c3475ce0157..5e36cfb73bd 100644
--- a/solr/webapp/web/js/angular/controllers/query.js
+++ b/solr/webapp/web/js/angular/controllers/query.js
@@ -142,7 +142,7 @@ solrAdminApp.controller('QueryController',
purgeParams(params, ["uf", "pf2", "pf3", "ps2", "ps3", "boost", "stopwords", "lowercaseOperators"], $scope.val.defType !== "edismax");
purgeParams(params, getDependentFields("hl"), $scope.val.hl !== true);
purgeParams(params, getDependentFields("facet"), $scope.val.facet !== true);
- purgeParams(params, getDependentFields("spatial"), $scope.val.spatial !== true);
+ purgeParams(params, ["spatial", "pt", "sfield", "d"], $scope.val.spatial !== true);
purgeParams(params, getDependentFields("spellcheck"), $scope.val.spellcheck !== true);
var qt = $scope.qt ? $scope.qt : "/select";
diff --git a/solr/webapp/web/partials/query.html b/solr/webapp/web/partials/query.html
index 4ca70f2b37d..f0544ca2a70 100644
--- a/solr/webapp/web/partials/query.html
+++ b/solr/webapp/web/partials/query.html
@@ -287,13 +287,13 @@ limitations under the License.
<div class="fieldset" ng-show="val['spatial']">
<label for="pt">pt</label>
- <input type="text" ng-model="val['spatial.pt']" name="pt" id="pt">
+ <input type="text" ng-model="val['pt']" name="pt" id="pt">
<label for="sfield">sfield</label>
- <input type="text" ng-model="val['spatial.sfield']" name="sfield" id="sfield">
+ <input type="text" ng-model="val['sfield']" name="sfield" id="sfield">
<label for="d">d</label>
- <input type="text" ng-model="val['spatial.d']" name="d" id="d">
+ <input type="text" ng-model="val['d']" name="d" id="d">
</div>
</fieldset>