This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 517b50c SOLR-15607: Invert indent UI behaviour (#278)
517b50c is described below
commit 517b50cd4b6719f2d12dde869f1c5e9328bb6348
Author: Olivigarden <[email protected]>
AuthorDate: Fri Sep 3 15:36:03 2021 -0600
SOLR-15607: Invert indent UI behaviour (#278)
* Change tooltips for indent switch and always show indent param in query.
---
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 10f1220..37e4f0b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -409,6 +409,8 @@ Improvements
* SOLR-15610: log4j-layout-template-json is now included in solr server,
allowing JSON formatted logs to be configurable. (hossman)
+* SOLR-15607: Explicitly indent results in Admin Query UI by default (Olvia
Falk via Eric Pugh)
+
Optimizations
---------------------
* SOLR-15433: Replace transient core cache LRU by Caffeine cache. (Bruno
Roustant)
diff --git a/solr/webapp/web/js/angular/controllers/query.js
b/solr/webapp/web/js/angular/controllers/query.js
index a1e8a38..86958c8 100644
--- a/solr/webapp/web/js/angular/controllers/query.js
+++ b/solr/webapp/web/js/angular/controllers/query.js
@@ -25,6 +25,7 @@ solrAdminApp.controller('QueryController',
$scope.val['q'] = "*:*";
$scope.val['q.op'] = "OR";
$scope.val['defType'] = "";
+ $scope.val['indent'] = true;
// get list of ng-models that have a form element
function setModels(argTagName){
@@ -134,7 +135,6 @@ solrAdminApp.controller('QueryController',
purgeParams(params, ["q.alt", "qf", "mm", "pf", "ps", "qs", "tie", "bq",
"bf"], $scope.val.defType !== "dismax" && $scope.val.defType !== "edismax");
purgeParams(params, ["uf", "pf2", "pf3", "ps2", "ps3", "boost",
"stopwords", "lowercaseOperators"], $scope.val.defType !== "edismax");
- purgeParams(params, getDependentFields("indent"), $scope.val.indent !==
false);
purgeParams(params, getDependentFields("hl"), $scope.val.hl !== true);
purgeParams(params, getDependentFields("facet"), $scope.val.facet !==
true);
purgeParams(params, getDependentFields("spatial"), $scope.val.spatial
!== true);
diff --git a/solr/webapp/web/partials/query.html
b/solr/webapp/web/partials/query.html
index 4c59865..571fe70 100644
--- a/solr/webapp/web/partials/query.html
+++ b/solr/webapp/web/partials/query.html
@@ -90,9 +90,9 @@ limitations under the License.
<option>csv</option>
</select>
- <label for="indent" class="checkbox" title="Do not indent results.">
- <input type="checkbox" ng-model="val['indent']" name="indent"
id="indent" title="Do not indent results." ng-true-value="false"
ng-false-value="true">
- indent off
+ <label for="indent" class="checkbox" title="Enable indenting of
results.">
+ <input type="checkbox" ng-model="val['indent']" name="indent"
id="indent" title="Enable indenting of results." ng-true-value="true"
ng-false-value="false">
+ indent on
</label>
</div>
