KYLIN-1849 search cube by name
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/64005c67 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/64005c67 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/64005c67 Branch: refs/heads/1.5.x-CDH5.7 Commit: 64005c67a4395d90b7732a069848f6aca0290934 Parents: e7d2956 Author: Jason <jiat...@163.com> Authored: Wed Aug 31 14:37:19 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Wed Aug 31 14:39:00 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubes.js | 4 ++-- webapp/app/partials/cubes/cubes.html | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/64005c67/webapp/app/js/controllers/cubes.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index 0ea8601..3f125a6 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -119,13 +119,13 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, $routeParams, $location, }) $scope.loading = false; - $scope.listParams.cubeName = ''; + //$scope.listParams.cubeName = ''; defer.resolve(resp); return defer.promise; },function(resp){ $scope.loading = false; - $scope.listParams.cubeName = ''; + //$scope.listParams.cubeName = ''; defer.resolve([]); SweetAlert.swal('Oops...', resp, 'error'); return defer.promise; http://git-wip-us.apache.org/repos/asf/kylin/blob/64005c67/webapp/app/partials/cubes/cubes.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html index 3f978a2..30981dc 100644 --- a/webapp/app/partials/cubes/cubes.html +++ b/webapp/app/partials/cubes/cubes.html @@ -17,28 +17,28 @@ --> <div class="row" ng-controller="CubesCtrl" style="margin-top:15px;"> -<div ng-if="!loading && cubeList.cubes.length == 0"> - <div no-result text="No Cube."></div> -</div> <loading ng-if="loading" text="Loading Cubes..."></loading> <!--Table--> -<div ng-if="cubeList.cubes.length > 0" class="dataTables_wrapper no-footer"> +<div class="dataTables_wrapper no-footer"> <div class="row"> - <div class="col-xs-10"> + <div class="col-xs-9"> <label class="table-header-text">Cubes</label> </div> - <div class="col-xs-2"> - <form class="" ng-submit="cubeList.removeAll();list(0,3)" style="display: inline" > + <div class="col-xs-3"> + <form style="display: inline;float:right;" > <span class="input-icon input-icon-right nav-search"> <input type="text" placeholder="Search by name" class="nav-search-input" ng-model="listParams.cubeName" /> - <i class="ace-icon fa fa-search blue" ng-click="cubeList.removeAll();list(0,3)"></i> + <i class="ace-icon fa fa-search blue" ng-click="cubeList.removeAll();reload()"></i> </span> </form> </div> </div> - - <table class="table table-striped table-bordered table-hover dataTable no-footer"> + + <div ng-if="!loading && cubeList.cubes.length == 0"> + <div no-result text="No Cube."></div> + </div> + <table ng-if="cubeList.cubes.length > 0" class="table table-striped table-bordered table-hover dataTable no-footer"> <!--Header--> <thead> <tr style="cursor: pointer">
