You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2020/04/03 21:16:19 UTC
[lucene-solr] branch master updated: SOLR-14359: Admin UI
collection/core drop-downs had wrong placeholder text (#1400)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 234e783 SOLR-14359: Admin UI collection/core drop-downs had wrong placeholder text (#1400)
234e783 is described below
commit 234e78350d972ba7ca6946c388c6bd8df1814f3c
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Fri Apr 3 23:16:11 2020 +0200
SOLR-14359: Admin UI collection/core drop-downs had wrong placeholder text (#1400)
---
solr/CHANGES.txt | 2 ++
solr/webapp/web/index.html | 4 ++--
solr/webapp/web/libs/angular-chosen.min.js | 21 +++++++++++++++++++--
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ebb5d05..30f6241 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -103,6 +103,8 @@ Bug Fixes
* SOLR-14356: PeerSync should not fail with SocketTimeoutException from hanging nodes (Cao Manh Dat)
+* SOLR-14359: Admin UI collection/core drop-downs had wrong placeholder text. Fixed by upgrading angular-chosen (janhoy)
+
Other Changes
---------------------
* SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid
diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html
index cb17caf..bb335c2 100644
--- a/solr/webapp/web/index.html
+++ b/solr/webapp/web/index.html
@@ -180,7 +180,7 @@ limitations under the License.
<div ng-show="!http401">
<div id="collection-selector" ng-show="isCloudEnabled">
<div id="has-collections" ng-show="collections.length!=0">
- <select data-placeholder="Collection Selector"
+ <select data-placeholder-text-single="Collection Selector"
ng-model="currentCollection"
chosen
ng-change="showCollection(currentCollection)"
@@ -206,7 +206,7 @@ limitations under the License.
</div>
<div id="core-selector">
<div id="has-cores" ng-show="cores.length!=0">
- <select data-placeholder="Core Selector"
+ <select data-placeholder-text-single="Core Selector"
ng-model="currentCore"
chosen
ng-change="showCore(currentCore)"
diff --git a/solr/webapp/web/libs/angular-chosen.min.js b/solr/webapp/web/libs/angular-chosen.min.js
index f43a11e..c3219dc 100644
--- a/solr/webapp/web/libs/angular-chosen.min.js
+++ b/solr/webapp/web/libs/angular-chosen.min.js
@@ -1,4 +1,21 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
The MIT License
Copyright (c) 2013 Localytics http://www.localytics.com
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -20,8 +37,8 @@ THE SOFTWARE.
/**
* angular-chosen-localytics - Angular Chosen directive is an AngularJS Directive that brings the Chosen jQuery in a Angular way
- * @version v1.3.0
+ * @version v1.9.2
* @link http://github.com/leocaseiro/angular-chosen
* @license MIT
*/
-(function(){var e=[].indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(t in this&&this[t]===e)return t;return-1};angular.module("localytics.directives",[]),angular.module("localytics.directives").directive("chosen",["$timeout",function(t){var n,r,i,s;return r=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,n=["persistentCreateOpt [...]
+(function(){var e,n=[].indexOf||function(e){for(var n=0,r=this.length;n<r;n++)if(n in this&&this[n]===e)return n;return-1};angular.module("localytics.directives",[]),e=angular.module("localytics.directives"),e.provider("chosen",function(){var e;return e={},{setOption:function(n){angular.extend(e,n)},$get:function(){return e}}}),e.directive("chosen",["chosen","$timeout","$parse",function(e,r,t){var i,a,s,l;return a=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+fo [...]
\ No newline at end of file