Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11843: Fix Admin UI handling of router.field and router.name params; change routerField label to match param name

This commit is contained in:
Cassandra Targett 2018-03-02 11:42:43 -06:00
parent ca2131573d
commit c59e2e98d2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -227,6 +227,9 @@ Bug Fixes
* SOLR-12050: UTILIZENODE does not enforce policy rules (hossman, noble) * SOLR-12050: UTILIZENODE does not enforce policy rules (hossman, noble)
* SOLR-11843: Admin UI collection creation was not properly handling the router.field and router.name parameters.
Also changed the display label in the Admin UI from routerField to router.field to match the actual API.
(Shawn Heisey via Cassandra Targett)
Optimizations Optimizations
---------------------- ----------------------
@ -303,7 +306,7 @@ Other Changes
* SOLR-11848: Update Ref Guide to include info on grouping operations and using curl for large files. (Dariusz Wojtas * SOLR-11848: Update Ref Guide to include info on grouping operations and using curl for large files. (Dariusz Wojtas
via Cassandra Targett) via Cassandra Targett)
* SOLR-11613: Make message for missing dataimport config in UI more explicit. (Shawn Heisey, Amrit Sarkar via * SOLR-11613: Make message for missing dataimport config in UI more explicit. (Shawn Heisey, Amrit Sarkar via
Cassandra Targett) Cassandra Targett)
* SOLR-11933: Make DIH UI page safer by not default checking the clean checkbox (Eric Pugh via Tomás Fernández Löbbe) * SOLR-11933: Make DIH UI page safer by not default checking the clean checkbox (Eric Pugh via Tomás Fernández Löbbe)

3
solr/webapp/web/js/angular/controllers/collections.js vendored
View File

@ -140,8 +140,7 @@ solrAdminApp.controller('CollectionsController',
maxShardsPerNode: coll.maxShardsPerNode maxShardsPerNode: coll.maxShardsPerNode
}; };
if (coll.shards) params.shards = coll.shards; if (coll.shards) params.shards = coll.shards;
if (coll.routerField) params.routerField = coll.routerField; if (coll.routerField) params["router.field"] = coll.routerField;
if (coll.routerName) params.routerName = coll.routerName;
Collections.add(params, function(data) { Collections.add(params, function(data) {
$scope.cancelAddCollection(); $scope.cancelAddCollection();
$scope.resetMenu("collections", Constants.IS_ROOT_PAGE); $scope.resetMenu("collections", Constants.IS_ROOT_PAGE);

2
solr/webapp/web/partials/collections.html
View File

@ -66,7 +66,7 @@ limitations under the License.
<p class="clearfix"><label for="add_shards">shards:</label> <p class="clearfix"><label for="add_shards">shards:</label>
<input type="text" name="shards" id="add_shards" ng-model="newCollection.shards"></p> <input type="text" name="shards" id="add_shards" ng-model="newCollection.shards"></p>
<p class="clearfix"><label for="add_routerField">routerField:</label> <p class="clearfix"><label for="add_routerField">router.field:</label>
<input type="text" name="routerField" id="add_routerField" ng-model="newCollection.routerField"></p> <input type="text" name="routerField" id="add_routerField" ng-model="newCollection.routerField"></p>
</div> </div>