You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2018/03/02 17:43:33 UTC
lucene-solr:master: SOLR-11843: Fix Admin UI handling of router.field
and router.name params; change routerField label to match param name
Repository: lucene-solr
Updated Branches:
refs/heads/master ca2131573 -> c59e2e98d
SOLR-11843: Fix Admin UI handling of router.field and router.name params; change routerField label to match param name
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c59e2e98
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c59e2e98
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c59e2e98
Branch: refs/heads/master
Commit: c59e2e98d2cef7c220f3b5dbea67fc4adbea0914
Parents: ca21315
Author: Cassandra Targett <ct...@apache.org>
Authored: Fri Mar 2 11:42:43 2018 -0600
Committer: Cassandra Targett <ct...@apache.org>
Committed: Fri Mar 2 11:42:43 2018 -0600
----------------------------------------------------------------------
solr/CHANGES.txt | 5 ++++-
solr/webapp/web/js/angular/controllers/collections.js | 3 +--
solr/webapp/web/partials/collections.html | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c59e2e98/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7da91f2..682f5d3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -227,6 +227,9 @@ Bug Fixes
* 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
----------------------
@@ -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
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)
* SOLR-11933: Make DIH UI page safer by not default checking the clean checkbox (Eric Pugh via Tomás Fernández Löbbe)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c59e2e98/solr/webapp/web/js/angular/controllers/collections.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/collections.js b/solr/webapp/web/js/angular/controllers/collections.js
index 251298a..c67bc7e 100644
--- a/solr/webapp/web/js/angular/controllers/collections.js
+++ b/solr/webapp/web/js/angular/controllers/collections.js
@@ -140,8 +140,7 @@ solrAdminApp.controller('CollectionsController',
maxShardsPerNode: coll.maxShardsPerNode
};
if (coll.shards) params.shards = coll.shards;
- if (coll.routerField) params.routerField = coll.routerField;
- if (coll.routerName) params.routerName = coll.routerName;
+ if (coll.routerField) params["router.field"] = coll.routerField;
Collections.add(params, function(data) {
$scope.cancelAddCollection();
$scope.resetMenu("collections", Constants.IS_ROOT_PAGE);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c59e2e98/solr/webapp/web/partials/collections.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/collections.html b/solr/webapp/web/partials/collections.html
index f958e14..6f0c421 100644
--- a/solr/webapp/web/partials/collections.html
+++ b/solr/webapp/web/partials/collections.html
@@ -66,7 +66,7 @@ limitations under the License.
<p class="clearfix"><label for="add_shards">shards:</label>
<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>
</div>