Apache Solr open-source search software
SOLR-15607: Invert indent UI behaviour (#278)
Olivigarden517b50cd4b67
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 10f12201127..37e4f0b9a35 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.jsindex a1e8a38f4dd..86958c820e0 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 elementfunction 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.htmlindex 4c59865e024..571fe703f23 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>