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 03:53:51 UTC
svn commit: r1709707 - in /lucene/dev/trunk/solr/webapp/web:
css/angular/collections.css index.html js/angular/controllers/collections.js
js/angular/controllers/core-overview.js js/angular/services.js
partials/collections.html
Author: upayavira
Date: Wed Oct 21 01:53:51 2015
New Revision: 1709707
URL: http://svn.apache.org/viewvc?rev=1709707&view=rev
Log:
SOLR-7666 Multiple minor fixes
Modified:
lucene/dev/trunk/solr/webapp/web/css/angular/collections.css
lucene/dev/trunk/solr/webapp/web/index.html
lucene/dev/trunk/solr/webapp/web/js/angular/controllers/collections.js
lucene/dev/trunk/solr/webapp/web/js/angular/controllers/core-overview.js
lucene/dev/trunk/solr/webapp/web/js/angular/services.js
lucene/dev/trunk/solr/webapp/web/partials/collections.html
Modified: lucene/dev/trunk/solr/webapp/web/css/angular/collections.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/angular/collections.css?rev=1709707&r1=1709706&r2=1709707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/angular/collections.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/angular/collections.css Wed Oct 21 01:53:51 2015
@@ -273,7 +273,7 @@ limitations under the License.
padding-right: 21px;
}
-#content #collections #add_advanced .open {
+#content #collections #add_advanced.open {
background-image: url( ../../img/ico/chevron-small.png );
}
Modified: lucene/dev/trunk/solr/webapp/web/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/index.html?rev=1709707&r1=1709706&r2=1709707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/index.html (original)
+++ lucene/dev/trunk/solr/webapp/web/index.html Wed Oct 21 01:53:51 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="#/{{currentCollection.name}}/collection-overview"><span>Overview</span></a></li>
+ <li class="overview" ng-class="{active:page=='collection-overview'}"><a href="#/{{currentCore.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/trunk/solr/webapp/web/js/angular/controllers/collections.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/angular/controllers/collections.js?rev=1709707&r1=1709706&r2=1709707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/angular/controllers/collections.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/angular/controllers/collections.js Wed Oct 21 01:53:51 2015
@@ -77,7 +77,7 @@ solrAdminApp.controller('CollectionsCont
$scope.hideAll();
$scope.showAdd = true;
$scope.newCollection = {
- name: "new_collection",
+ name: "",
routerName: "compositeId",
numShards: 1,
configName: "",
@@ -207,7 +207,6 @@ solrAdminApp.controller('CollectionsCont
};
$scope.deleteReplica = function(replica) {
- alert("DELETE");
Collections.deleteReplica({collection: replica.collection, shard:replica.shard, replica:replica.name}, function(data) {
replica.deleted = true;
$timeout(function() {
Modified: lucene/dev/trunk/solr/webapp/web/js/angular/controllers/core-overview.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/angular/controllers/core-overview.js?rev=1709707&r1=1709706&r2=1709707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/angular/controllers/core-overview.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/angular/controllers/core-overview.js Wed Oct 21 01:53:51 2015
@@ -103,13 +103,14 @@ function($scope, $rootScope, $routeParam
$scope.refreshPing = function() {
Ping.status({core: $routeParams.core}, function(data) {
- if (data.error) {
+ $scope.healthcheckStatus = data.status == "enabled";
+ }).$promise.catch(function(error) {
+ if (error.status == 404) {
$scope.healthcheckStatus = false;
- if (data.error.code == 503) {
- $scope.healthcheckMessage = 'Ping request handler is not configured with a healthcheck file.';
- }
} else {
- $scope.healthcheckStatus = data.status == "enabled";
+ $scope.healthcheckStatus = false;
+ delete $rootScope.exception;
+ $scope.healthcheckMessage = 'Ping request handler is not configured with a healthcheck file.';
}
});
};
Modified: lucene/dev/trunk/solr/webapp/web/js/angular/services.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/angular/services.js?rev=1709707&r1=1709706&r2=1709707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/angular/services.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/angular/services.js Wed Oct 21 01:53:51 2015
@@ -136,7 +136,7 @@ solrAdminServices.factory('System',
.factory('Luke',
['$resource', function($resource) {
return $resource('/solr/:core/admin/luke', {core: '@core', wt:'json', _:Date.now()}, {
- "index": {params: {numTerms: 0, show: 'index'}},
+ "index": {params: {numTerms: 0}},
"schema": {params: {show:'schema'}},
"field": {},
"fields": {params: {show:'schema'}, interceptor: {
@@ -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"}, headers: {doNotIntercept: "true"}
- }});
+ "status": {params:{action:"status"}}
+ });
}])
.factory('Mbeans',
['$resource', function($resource) {
Modified: lucene/dev/trunk/solr/webapp/web/partials/collections.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/partials/collections.html?rev=1709707&r1=1709706&r2=1709707&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/partials/collections.html (original)
+++ lucene/dev/trunk/solr/webapp/web/partials/collections.html Wed Oct 21 01:53:51 2015
@@ -35,7 +35,7 @@ limitations under the License.
<form>
<p class="clearfix"><label for="add_name">name:</label>
- <input type="text" name="name" id="add_name" ng-model="newCollection.name"></p>
+ <input type="text" name="name" id="add_name" ng-model="newCollection.name" placeholder="new collection"></p>
<p class="clearfix"><label for="add_config">config set:</label>
<select chosen ng-options="config.name as config.name for config in configs" name="config_name" id="add_config" ng-model="newCollection.configName">