You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ka...@apache.org on 2017/07/07 08:38:45 UTC
[43/50] [abbrv] kylin git commit: minor,
clean unnecessary line feed and wrong cancel btn
minor, clean unnecessary line feed and wrong cancel btn
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/46d144a0
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/46d144a0
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/46d144a0
Branch: refs/heads/KYLIN-2606
Commit: 46d144a027a75d9cab71581da2ec9ad4f674c477
Parents: 4496135
Author: luguosheng1314 <55...@qq.com>
Authored: Tue Jul 4 16:52:55 2017 +0800
Committer: chenzhx <34...@qq.com>
Committed: Tue Jul 4 18:14:08 2017 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/access.js | 1 -
webapp/app/js/model/cubeDescModel.js | 6 ------
webapp/app/js/model/cubeListModel.js | 1 -
webapp/app/js/model/jobListModel.js | 4 ----
webapp/app/js/model/streamingListModel.js | 6 ------
webapp/app/partials/cubes/cube_json_edit.html | 2 +-
webapp/app/partials/projects/project_create.html | 2 +-
7 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/46d144a0/webapp/app/js/controllers/access.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/access.js b/webapp/app/js/controllers/access.js
index 6187f9a..61e8f3e 100644
--- a/webapp/app/js/controllers/access.js
+++ b/webapp/app/js/controllers/access.js
@@ -28,7 +28,6 @@ KylinApp.controller('AccessCtrl', function ($scope, AccessService, MessageServic
"<li>CUBE ADMIN: Full access to cube and jobs, including access management.</li></ul></div>";
$scope.authorities = null;
-
AuthenticationService.authorities({}, function (authorities) {
$scope.authorities = authorities.stringList;
});
http://git-wip-us.apache.org/repos/asf/kylin/blob/46d144a0/webapp/app/js/model/cubeDescModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeDescModel.js b/webapp/app/js/model/cubeDescModel.js
index d0f5250..b9b95da 100644
--- a/webapp/app/js/model/cubeDescModel.js
+++ b/webapp/app/js/model/cubeDescModel.js
@@ -19,8 +19,6 @@
KylinApp.service('CubeDescModel', function (kylinConfig) {
this.cubeMetaFrame = {};
-
- //
this.createNew = function (defaultPara) {
var cubeMeta = {
"name": "",
@@ -100,10 +98,6 @@ KylinApp.service('CubeDescModel', function (kylinConfig) {
"joint_dims" : [ ]//2 dim array
}
}
-
return group;
}
-
-
-
})
http://git-wip-us.apache.org/repos/asf/kylin/blob/46d144a0/webapp/app/js/model/cubeListModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeListModel.js b/webapp/app/js/model/cubeListModel.js
index 39853c0..b08ddbe 100755
--- a/webapp/app/js/model/cubeListModel.js
+++ b/webapp/app/js/model/cubeListModel.js
@@ -47,7 +47,6 @@ KylinApp.service('CubeList',function(CubeService,$q,AccessService){
defer.reject("Failed to load cubes");
});
return defer.promise;
-
};
this.removeCube = function(cube){
http://git-wip-us.apache.org/repos/asf/kylin/blob/46d144a0/webapp/app/js/model/jobListModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/jobListModel.js b/webapp/app/js/model/jobListModel.js
index ee75d2f..95e0be3 100755
--- a/webapp/app/js/model/jobListModel.js
+++ b/webapp/app/js/model/jobListModel.js
@@ -25,7 +25,6 @@ KylinApp.service('JobList',function(JobService,$q){
this.jobs={};
this.list = function(jobRequest){
-
var defer = $q.defer();
JobService.list(jobRequest, function (jobs) {
angular.forEach(jobs, function (job) {
@@ -45,13 +44,10 @@ KylinApp.service('JobList',function(JobService,$q){
},function(){
defer.reject("failed to load jobs");
});
-
return defer.promise;
-
};
this.removeAll = function(){
_this.jobs={};
};
-
});
http://git-wip-us.apache.org/repos/asf/kylin/blob/46d144a0/webapp/app/js/model/streamingListModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/streamingListModel.js b/webapp/app/js/model/streamingListModel.js
index 113ffe6..d397b8b 100644
--- a/webapp/app/js/model/streamingListModel.js
+++ b/webapp/app/js/model/streamingListModel.js
@@ -20,15 +20,10 @@ KylinApp.service('StreamingList', function (CubeService, $q, AccessService, Stre
var _this = this;
this.streamingConfigs = [];
this.kafkaConfigs = [];
-
-
this.list = function () {
var defer = $q.defer();
-
var streamingPromises = [];
var kafkaPromises = [];
-
-
kafkaPromises.push(StreamingService.getKfkConfig({}, function (kfkConfigs) {
_this.kafkaConfigs = kfkConfigs;
},function(){
@@ -47,7 +42,6 @@ KylinApp.service('StreamingList', function (CubeService, $q, AccessService, Stre
defer.resolve("failed");
})
return defer.promise;
-
};
this.checkCubeExist = function(cubeName){
http://git-wip-us.apache.org/repos/asf/kylin/blob/46d144a0/webapp/app/partials/cubes/cube_json_edit.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cube_json_edit.html b/webapp/app/partials/cubes/cube_json_edit.html
index ac08d1d..feb81c1 100644
--- a/webapp/app/partials/cubes/cube_json_edit.html
+++ b/webapp/app/partials/cubes/cube_json_edit.html
@@ -39,7 +39,7 @@
}" ng-model="state.cubeSchema">
</div>
</section>
- <button class="btn btn-primary" ng-disabled="cube_form.$invalid" ng-click="state.project = projectModel.selectedProject;saveCube()">
+ <button class="btn btn-primary" style="float:right;margin-bottom: 10px;" ng-disabled="cube_form.$invalid" ng-click="state.project = projectModel.selectedProject;saveCube()">
Save
</button>
</form>
http://git-wip-us.apache.org/repos/asf/kylin/blob/46d144a0/webapp/app/partials/projects/project_create.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/projects/project_create.html b/webapp/app/partials/projects/project_create.html
index 2dc76da..ceba015 100644
--- a/webapp/app/partials/projects/project_create.html
+++ b/webapp/app/partials/projects/project_create.html
@@ -81,7 +81,7 @@
</div>
</div>
<div class="modal-footer">
- <button class="btn btn-primary" ng-click="cancel()">Close</button>
+ <button class="btn" ng-click="cancel()">Close</button>
<button class="btn btn-success" ng-click="createOrUpdate()" ng-disabled="proj_create_form.$invalid">
Submit
</button>