Skip to content

SOLR-16142: Fix Admin UI's spatial parameter generation. #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cpoerschke merged 5 commits into from
Jun 28, 2022
Merged

SOLR-16142: Fix Admin UI's spatial parameter generation. #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4b8bbb
SOLR-16142: Fix Admin UI's spatial parameter generation.
cpoerschke Jun 1, 2022
7d8316d
(not yet tested) query.js change
cpoerschke Jun 1, 2022
4349c7c
purge 'spatial' or else spatial=false is added when unchecking box
cpoerschke Jun 1, 2022
7854504
Merge branch 'main' into SOLR-16142
cpoerschke Jun 24, 2022
9147a2f
Merge branch 'main' into SOLR-16142
cpoerschke Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,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)
Expand Down
2 changes: 1 addition & 1 deletion solr/webapp/web/js/angular/controllers/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 3 additions & 3 deletions solr/webapp/web/partials/query.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,13 @@
<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>
Expand Down