Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7783 - AngularUI core admin optimize fixes 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1690537 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Upayavira 2015-07-12 21:44:06 +00:00
parent d821ea9fd2
commit 566859fb52
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
solr/webapp/web/js/angular/controllers/cores.js vendored
View File

@ -17,14 +17,13 @@
// @todo test optimize (delete stuff, watch button appear, test button/form) // @todo test optimize (delete stuff, watch button appear, test button/form)
solrAdminApp.controller('CoreAdminController', solrAdminApp.controller('CoreAdminController',
['$scope', '$routeParams', '$location', '$timeout', 'Cores', ['$scope', '$routeParams', '$location', '$timeout', 'Cores', 'Update',
function($scope, $routeParams, $location, $timeout, Cores){ function($scope, $routeParams, $location, $timeout, Cores, Update){
$scope.resetMenu("cores"); $scope.resetMenu("cores");
$scope.currentCore = $routeParams.core; $scope.currentCore = $routeParams.core;
$scope.refresh = function() { $scope.refresh = function() {
Cores.get(function(data) { Cores.get(function(data) {
var coreCount = 0; var coreCount = 0;
// @todo mark 'current' core in navigation with 'current' style
for (_obj in data.status) coreCount++; for (_obj in data.status) coreCount++;
$scope.hasCores = coreCount >0; $scope.hasCores = coreCount >0;
if (!$scope.currentCore && coreCount==0) { if (!$scope.currentCore && coreCount==0) {
@ -165,6 +164,17 @@ solrAdminApp.controller('CoreAdminController',
}; };
$scope.optimizeCore = function() { $scope.optimizeCore = function() {
Update.optimize({core: $scope.currentCore},
function(successData) {
$scope.optimizeSuccess = true;
$timeout(function() {$scope.optimizeSuccess=false}, 1000);
$scope.refresh();
},
function(failureData) {
$scope.optimizeFailure = true;
$timeout(function () {$scope.optimizeFailure=false}, 1000);
$scope.refresh();
});
}; };
$scope.refresh(); $scope.refresh();

5
solr/webapp/web/partials/cores.html
View File

@ -29,7 +29,8 @@ limitations under the License.
<button id="swap" class="action requires-core" ng-click="showSwapCores()"><span>Swap</span></button> <button id="swap" class="action requires-core" ng-click="showSwapCores()"><span>Swap</span></button>
<button id="reload" class="requires-core" ng-click="reloadCore()" <button id="reload" class="requires-core" ng-click="reloadCore()"
ng-class="{success: reloadSuccess, warn: reloadFailure}"><span>Reload</span></button> ng-class="{success: reloadSuccess, warn: reloadFailure}"><span>Reload</span></button>
<button id="optimize" class="requires-core" ng-click="optimizeCore()" ng-show="core.hasDeletions"><span>Optimize</span></button> <button id="optimize" class="requires-core" ng-click="optimizeCore()" ng-show="core.index.hasDeletions || optimizeSuccess"
ng-class="{success: optimizeSuccess, warn: optimizeFailure}"><span>Optimize</span></button>
</span> </span>
<div class="action add" data-rel="add" ng-show="showAdd" style="display:block;left:0px;"> <div class="action add" data-rel="add" ng-show="showAdd" style="display:block;left:0px;">
@ -199,7 +200,7 @@ limitations under the License.
<li class="optimized"><dl class="clearfix"> <li class="optimized"><dl class="clearfix">
<dt><span>optimized:</span></dt> <dt><span>optimized:</span></dt>
<dd class="ico" ng-class="core.index.hasDeletions ? 'ico-1' : 'ico-0'"><span></span></dd> <dd class="ico" ng-class="core.index.hasDeletions ? 'ico-0' : 'ico-1'"><span></span></dd>
</dl></li> </dl></li>
<li class="current"><dl class="clearfix"> <li class="current"><dl class="clearfix">