You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2016/01/21 07:30:49 UTC
kylin git commit: minor,
use angularjs directive to convert GMT0 timestamp for partition_date,
rm jobEndTime rollback action
Repository: kylin
Updated Branches:
refs/heads/1.x-staging eea691651 -> b6c057609
minor,use angularjs directive to convert GMT0 timestamp for partition_date,rm jobEndTime rollback action
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b6c05760
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b6c05760
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b6c05760
Branch: refs/heads/1.x-staging
Commit: b6c05760962b2fe5287d331e95e337752dda73c4
Parents: eea6916
Author: jian <zh...@apache.org>
Authored: Thu Jan 21 14:30:18 2016 +0800
Committer: jian <zh...@apache.org>
Committed: Thu Jan 21 14:30:36 2016 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubes.js | 17 ++---------------
webapp/app/js/directives/directives.js | 2 +-
webapp/app/partials/jobs/job_merge.html | 2 +-
webapp/app/partials/jobs/job_refresh.html | 2 +-
webapp/app/partials/jobs/job_submit.html | 2 +-
5 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c05760/webapp/app/js/controllers/cubes.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index 2896a1a..6801561 100755
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -454,17 +454,13 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic
};
$scope.message = "";
- $scope.rebuild = function (jobsubmit) {
+ $scope.rebuild = function () {
$scope.message = null;
if ($scope.jobBuildRequest.startTime >= $scope.jobBuildRequest.endTime) {
$scope.message = "WARNING: End time should be later than the start time.";
- //rollback date setting
- if (jobsubmit) {
- $scope.rebuildRollback();
- }
return;
}
@@ -476,11 +472,6 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic
SweetAlert.swal('Success!', 'Rebuild job was submitted successfully', 'success');
}, function (e) {
- //rollback date setting
- if (jobsubmit) {
- $scope.rebuildRollback();
- }
-
loadingRequest.hide();
if (e.data && e.data.exception) {
var message = e.data.exception;
@@ -497,7 +488,7 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic
}, function (isConfirm) {
if (isConfirm) {
$scope.jobBuildRequest.forceMergeEmptySegment = true;
- $scope.rebuild(jobsubmit);
+ $scope.rebuild();
}
});
return;
@@ -511,10 +502,6 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic
});
};
- $scope.rebuildRollback = function () {
- $scope.jobBuildRequest.endTime += new Date().getTimezoneOffset() * 60000;
- }
-
// used by cube segment refresh
$scope.segmentSelected = function (selectedSegment) {
$scope.jobBuildRequest.startTime = 0;
http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c05760/webapp/app/js/directives/directives.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/directives/directives.js b/webapp/app/js/directives/directives.js
index f73b8a8..7b47137 100644
--- a/webapp/app/js/directives/directives.js
+++ b/webapp/app/js/directives/directives.js
@@ -228,4 +228,4 @@ KylinApp.directive('kylinPagination', function ($parse, $q) {
});
}
};
- });;
+ });
http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c05760/webapp/app/partials/jobs/job_merge.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/job_merge.html b/webapp/app/partials/jobs/job_merge.html
index c55b280..f5c3965 100644
--- a/webapp/app/partials/jobs/job_merge.html
+++ b/webapp/app/partials/jobs/job_merge.html
@@ -124,7 +124,7 @@
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="cancel()">Close</button>
- <button class="btn btn-success" ng-click="rebuild(false)"
+ <button class="btn btn-success" ng-click="rebuild()"
ng-disabled="!(jobBuildRequest.startTime >= 0 && jobBuildRequest.endTime > 0)">
Submit
</button>
http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c05760/webapp/app/partials/jobs/job_refresh.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/job_refresh.html b/webapp/app/partials/jobs/job_refresh.html
index b8ffa6e..aa8f930 100644
--- a/webapp/app/partials/jobs/job_refresh.html
+++ b/webapp/app/partials/jobs/job_refresh.html
@@ -92,7 +92,7 @@
<div class="modal-footer">
<button class="btn btn-primary" ng-click="cancel()">Close</button>
- <button class="btn btn-success" ng-click="rebuild(false)"
+ <button class="btn btn-success" ng-click="rebuild()"
ng-disabled="!(jobBuildRequest.startTime >= 0 && jobBuildRequest.endTime > 0)">Submit
</button>
</div>
http://git-wip-us.apache.org/repos/asf/kylin/blob/b6c05760/webapp/app/partials/jobs/job_submit.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/job_submit.html b/webapp/app/partials/jobs/job_submit.html
index 390cb3e..1f3b4ee 100644
--- a/webapp/app/partials/jobs/job_submit.html
+++ b/webapp/app/partials/jobs/job_submit.html
@@ -72,7 +72,7 @@
</div>
</div>
<div class="modal-footer">
- <button class="btn btn-success" ng-click="rebuild(true)" ng-disabled="jobBuildRequest.endTime<=0">Submit</button>
+ <button class="btn btn-success" ng-click="rebuild()" ng-disabled="jobBuildRequest.endTime<=0">Submit</button>
<button class="btn btn-primary" ng-click="cancel()">Close</button>
</div>
</script>