Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15650: make not picking a defType more explicit in UI (#302)

Eric Pugh855488980ba6
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 12bfdde6f6e..2d1e1b4039a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -148,6 +148,9 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)
* SOLR-15630: Logging MDC values no longer include a hardcoded prefix, allowing custom logging configurations access to the plain values.
The default log4j2.xml PatternLayout has been updated to ensure the values are formatted with the existing prefixes. (hossman)
+* SOLR-15650: Choosing lucene defType in Solr Admin now is passed explicitly through UI, not relying on default solrconfig.xml behavior. (Eric Pugh)
+
+
Build
---------------------
diff --git a/solr/webapp/web/partials/query.html b/solr/webapp/web/partials/query.html
index 571fe703f23..a09e9689ba9 100644
--- a/solr/webapp/web/partials/query.html
+++ b/solr/webapp/web/partials/query.html
@@ -120,14 +120,15 @@ limitations under the License.
<label for="defType" class="checkbox" title="Choose defType">
defType
<select ng-model="val['defType']" name="defType" id="defType">
- <option ng-selected="selected" value=''>lucene</option>
- <option>dismax</option>
- <option>edismax</option>
+ <option ng-selected="selected" value=''>------</option>
+ <option value="lucene">lucene</option>
+ <option value="dismax">dismax</option>
+ <option value="edismax">edismax</option>
</select>
</label>
</legend>
- <div class="fieldset" ng-show="val['defType']!=''">
+ <div class="fieldset" ng-show="val['defType']=='dismax' || val['defType']=='edismax'">
<label for="q_alt" title="Alternate query when 'q' is absent.">q.alt</label>
<input type="text" ng-model="val['q.alt']" name="q.alt" id="q_alt" title="Alternate query when 'q' is absent.">