You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by up...@apache.org on 2015/10/21 04:57:32 UTC
svn commit: r1709712 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/webapp/ solr/webapp/web/ solr/webapp/web/js/angular/
solr/webapp/web/js/angular/controllers/ solr/webapp/web/partials/
Author: upayavira
Date: Wed Oct 21 02:57:32 2015
New Revision: 1709712
URL: http://svn.apache.org/viewvc?rev=1709712&view=rev
Log:
SOLR-7666 Re-fix some accidentally reverted changes
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/web/index.html
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/core-overview.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/files.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js
lucene/dev/branches/branch_5x/solr/webapp/web/partials/query.html
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/index.html?rev=1709712&r1=1709711&r2=1709712&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/index.html (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/index.html Wed Oct 21 02:57:32 2015
@@ -177,7 +177,7 @@ limitations under the License.
</div>
<div id="collection-menu" class="sub-menu" ng-show="currentCollection">
<ul>
- <li class="overview" ng-class="{active:page=='collection-overview'}"><a href="#/{{currentCore.name}}/collection-overview"><span>Overview</span></a></li>
+ <li class="overview" ng-class="{active:page=='collection-overview'}"><a href="#/{{currentCollection.name}}/collection-overview"><span>Overview</span></a></li>
<li class="analysis" ng-class="{active:page=='analysis'}"><a href="#/{{currentCollection.name}}/analysis"><span>Analysis</span></a></li>
<li class="dataimport" ng-class="{active:page=='dataimport'}"><a href="#/{{currentCollection.name}}/dataimport"><span>Dataimport</span></a></li>
<li class="documents" ng-class="{active:page=='documents'}"><a href="#/{{currentCollection.name}}/documents"><span>Documents</span></a></li>
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/core-overview.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/core-overview.js?rev=1709712&r1=1709711&r2=1709712&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/core-overview.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/core-overview.js Wed Oct 21 02:57:32 2015
@@ -103,14 +103,13 @@ function($scope, $rootScope, $routeParam
$scope.refreshPing = function() {
Ping.status({core: $routeParams.core}, function(data) {
- $scope.healthcheckStatus = data.status == "enabled";
- }).$promise.catch(function(error) {
- if (error.status == 404) {
+ if (data.error) {
$scope.healthcheckStatus = false;
+ if (data.error.code == 503) {
+ $scope.healthcheckMessage = 'Ping request handler is not configured with a healthcheck file.';
+ }
} else {
- $scope.healthcheckStatus = false;
- delete $rootScope.exception;
- $scope.healthcheckMessage = 'Ping request handler is not configured with a healthcheck file.';
+ $scope.healthcheckStatus = data.status == "enabled";
}
});
};
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/files.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/files.js?rev=1709712&r1=1709711&r2=1709712&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/files.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/files.js Wed Oct 21 02:57:32 2015
@@ -38,7 +38,10 @@ solrAdminApp.controller('FilesController
}
Files.list(params, function (data) {
- for (var file in data.files) {
+ var filenames = Object.keys(data.files);
+ filenames.sort();
+ for (var i in filenames) {
+ var file = filenames[i];
var filedata = data.files[file];
var state = undefined;
var children = undefined;
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js?rev=1709712&r1=1709711&r2=1709712&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/query.js Wed Oct 21 02:57:32 2015
@@ -63,7 +63,9 @@ solrAdminApp.controller('QueryController
if ($scope.isSpellcheck) copy(params, $scope.spellcheck);
if ($scope.rawParams) {
- for (var param in $scope.rawParams.split(/[&\n]/)) {
+ var rawParams = $scope.rawParams.split(/[&\n]/);
+ for (var i in rawParams) {
+ var param = rawParams[i];
var parts = param.split("=");
set(parts[0], parts[1]);
}
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js?rev=1709712&r1=1709711&r2=1709712&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js Wed Oct 21 02:57:32 2015
@@ -178,8 +178,8 @@ solrAdminServices.factory('System',
['$resource', function($resource) {
return $resource('/solr/:core/admin/ping', {wt:'json', core: '@core', ts:Date.now(), _:Date.now()}, {
"ping": {},
- "status": {params:{action:"status"}}
- });
+ "status": {params:{action:"status"}, headers: {doNotIntercept: "true"}
+ }});
}])
.factory('Mbeans',
['$resource', function($resource) {
@@ -232,7 +232,7 @@ solrAdminServices.factory('System',
return "/solr/" + params.core + params.handler + "?" + qs.sort().join("&");
}
return resource;
- }])
+}])
.factory('Segments',
['$resource', function($resource) {
return $resource('/solr/:core/admin/segments', {'wt':'json', core: '@core', _:Date.now()}, {
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/partials/query.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/partials/query.html?rev=1709712&r1=1709711&r2=1709712&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/partials/query.html (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/partials/query.html Wed Oct 21 02:57:32 2015
@@ -251,13 +251,13 @@ limitations under the License.
<div class="fieldset" ng-show="isFacet">
<label for="facet_query">facet.query</label>
- <textarea ng-model="facet.query" name="facet.query" id="facet_query"></textarea>
+ <textarea ng-model="facet['facet.query']" name="facet.query" id="facet_query"></textarea>
<label for="facet_field">facet.field</label>
- <input type="text" ng-model="facet.field" name="facet.field" id="facet_field">
+ <input type="text" ng-model="facet['facet.field']" name="facet.field" id="facet_field">
<label for="facet_prefix">facet.prefix</label>
- <input type="text" ng-model="facet.prefix" name="facet.prefix" id="facet_prefix">
+ <input type="text" ng-model="facet['facet.prefix']" name="facet.prefix" id="facet_prefix">
</div>
</fieldset>
@@ -293,47 +293,47 @@ limitations under the License.
<div class="fieldset" ng-show="isSpellcheck">
<label for="spellcheck_build" class="checkbox">
- <input type="checkbox" ng-model="spellcheck.build" name="spellcheck.build" id="spellcheck_build" value="true">
+ <input type="checkbox" ng-model="spellcheck['spellcheck.build']" name="spellcheck.build" id="spellcheck_build" value="true">
spellcheck.build
</label>
<label for="spellcheck_reload" class="checkbox">
- <input type="checkbox" ng-model="spellcheck.reload" name="spellcheck.reload" id="spellcheck_reload" value="true">
+ <input type="checkbox" ng-model="spellcheck['spellcheck.reload']" name="spellcheck.reload" id="spellcheck_reload" value="true">
spellcheck.reload
</label>
<label for="spellcheck_q">spellcheck.q</label>
- <input type="text" ng-model="spellcheck.q" name="spellcheck.q" id="spellcheck_q">
+ <input type="text" ng-model="spellcheck['spellcheck.q']" name="spellcheck.q" id="spellcheck_q">
<label for="spellcheck_dictionary">spellcheck.dictionary</label>
- <input type="text" ng-model="spellcheck.dictionary" name="spellcheck.dictionary" id="spellcheck_dictionary">
+ <input type="text" ng-model="spellcheck['spellcheck.dictionary']" name="spellcheck.dictionary" id="spellcheck_dictionary">
<label for="spellcheck_count">spellcheck.count</label>
- <input type="text" ng-model="spellcheck.count" name="spellcheck.count" id="spellcheck_count">
+ <input type="text" ng-model="spellcheck['spellcheck.count']" name="spellcheck.count" id="spellcheck_count">
<label for="spellcheck_onlyMorePopular" class="checkbox">
- <input type="checkbox" ng-model="spellcheck.onlyMorePopular" name="spellcheck.onlyMorePopular" id="spellcheck_onlyMorePopular" value="true">
+ <input type="checkbox" ng-model="spellcheck['spellcheck.onlyMorePopular']" name="spellcheck.onlyMorePopular" id="spellcheck_onlyMorePopular" value="true">
spellcheck.onlyMorePopular
</label>
<label for="spellcheck_extendedResults" class="checkbox">
- <input type="checkbox" ng-model="spellcheck.extendedResults" name="spellcheck.extendedResults" id="spellcheck_extendedResults" value="true">
+ <input type="checkbox" ng-model="spellcheck['spellcheck.extendedResults']" name="spellcheck.extendedResults" id="spellcheck_extendedResults" value="true">
spellcheck.extendedResults
</label>
<label for="spellcheck_collate" class="checkbox">
- <input type="checkbox" ng-model="spellcheck.collate" name="spellcheck.collate" id="spellcheck_collate" value="true">
+ <input type="checkbox" ng-model="spellcheck['spellcheck.collate']" name="spellcheck.collate" id="spellcheck_collate" value="true">
spellcheck.collate
</label>
<label for="spellcheck_maxCollations">spellcheck.maxCollations</label>
- <input type="text" ng-model="spellcheck.maxCollations" name="spellcheck.maxCollations" id="spellcheck_maxCollations">
+ <input type="text" ng-model="spellcheck['spellcheck.maxCollations']" name="spellcheck.maxCollations" id="spellcheck_maxCollations">
<label for="spellcheck_maxCollationTries">spellcheck.maxCollationTries</label>
- <input type="text" ng-model="spellcheck.maxCollationTries" name="spellcheck.maxCollationTries" id="spellcheck_maxCollationTries">
+ <input type="text" ng-model="spellcheck['spellcheck.maxCollationTries']" name="spellcheck.maxCollationTries" id="spellcheck_maxCollationTries">
<label for="spellcheck_accuracy">spellcheck.accuracy</label>
- <input type="text" ng-model="spellcheck.accuracy" name="spellcheck.accuracy" id="spellcheck_accuracy">
+ <input type="text" ng-model="spellcheck['spellcheck.accuracy']" name="spellcheck.accuracy" id="spellcheck_accuracy">
</div>
</fieldset>