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/02/01 22:40:17 UTC
lucene-solr:branch_7x: SOLR-11613: Make message for missing
dataimport config in UI more explicit
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x abedf4170 -> 2b985784d
SOLR-11613: Make message for missing dataimport config in UI more explicit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2b985784
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2b985784
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2b985784
Branch: refs/heads/branch_7x
Commit: 2b985784d963d1a216f64c00afb2cf41b93514e5
Parents: abedf41
Author: Cassandra Targett <ct...@apache.org>
Authored: Thu Feb 1 16:38:57 2018 -0600
Committer: Cassandra Targett <ct...@apache.org>
Committed: Thu Feb 1 16:40:09 2018 -0600
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/webapp/web/partials/dataimport.html | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2b985784/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 10c485b..f926075 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -227,6 +227,8 @@ 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 Cassandra Targett)
+
================== 7.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2b985784/solr/webapp/web/partials/dataimport.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/dataimport.html b/solr/webapp/web/partials/dataimport.html
index 5cd6d2c..dd11f54 100644
--- a/solr/webapp/web/partials/dataimport.html
+++ b/solr/webapp/web/partials/dataimport.html
@@ -16,7 +16,7 @@ limitations under the License.
-->
<div id="dataimport" class="clearfix">
- <div ng-show="!hasHandlers">Sorry, no dataimport-handler defined!</div>
+ <div ng-show="!hasHandlers">The solrconfig.xml file for this index does not have an operational DataImportHandler defined!</div>
<div id="frame" ng-show="hasHandlers">
<div id="error" ng-show="error"></div>
@@ -50,7 +50,7 @@ limitations under the License.
</button>
</div>
-
+
</div>
<div class="block" id="raw_output" >
@@ -58,7 +58,7 @@ limitations under the License.
<h2>
<a class="toggle" ng-click="toggleRawStatus()"><span>Raw Status-Output</span></a>
</h2>
-
+
<div class="message-container" ng-show="showRawStatus">
<div class="message"></div>
</div>
@@ -68,7 +68,7 @@ limitations under the License.
<div id="raw_output_container"><pre class="syntax language-json"><code ng-bind-html="rawStatus | highlight:'json' | unsafe"></code></pre></div>
</div>
-
+
</div>
<div class="block" id="config" ng-class="{debug_mode:isDebugMode}">
@@ -78,7 +78,7 @@ limitations under the License.
<a class="r reload_config" ng-class="{success:reloaded}" ng-click="reload()" title="Reload Configuration">Reload</a>
<a class="r debug_mode" ng-click="toggleDebug()">Debug-Mode</a>
</h2>
-
+
<div class="message-container" ng-show="showConfiguration">
<div class="message"></div>
</div>
@@ -95,13 +95,13 @@ limitations under the License.
<div class="editable" ng-show="isDebugMode">
<textarea ng-model="config"></textarea>
-
+
</div>
</div>
</div>
-
+
</div>
<div class="block" id="debug_response" ng-show="form.showDebug">
@@ -109,7 +109,7 @@ limitations under the License.
<h2>
<a class="toggle" ng-click="toggleRawDebug()"><span>Raw Debug-Response</span></a>
</h2>
-
+
<div class="message-container" ng-show="showRawDebug">
<div class="message"></div>
</div>
@@ -122,9 +122,9 @@ limitations under the License.
<pre class="syntax language-json"><code ng-bind-html="rawResponse | highlight:'json' | unsafe"></code></pre>
</span>
</div>
-
+
</div>
-
+
</div>
<div id="form" ng-show="hasHandlers">
@@ -203,7 +203,7 @@ limitations under the License.
<button class="refresh-status" ng-click="refreshStatus()" ng-class="{loader: isStatusLoading, success: statusUpdated}"><span>Refresh Status</span></button>
<p id="auto-refresh-status"><a ng-click="updateAutoRefresh()" ng-class="{on:autorefresh}">Auto-Refresh Status</a></p>
-
+
</div>
</div>