You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/06/14 07:31:37 UTC
incubator-griffin git commit: Job1
Repository: incubator-griffin
Updated Branches:
refs/heads/master 0bc886340 -> b8eb67bbe
Job1
Author: Yang <xi...@ebay.com>
Closes #77 from RachelYang2/job1.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/b8eb67bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b8eb67bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b8eb67bb
Branch: refs/heads/master
Commit: b8eb67bbea875f0f537bebab076ea7899ec24834
Parents: 0bc8863
Author: Yang <xi...@ebay.com>
Authored: Wed Jun 14 15:31:30 2017 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Wed Jun 14 15:31:30 2017 +0800
----------------------------------------------------------------------
ui/js/controllers/createjob-ac-ctrl.js | 2 +-
ui/js/controllers/viewrule-ctrl.js | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/b8eb67bb/ui/js/controllers/createjob-ac-ctrl.js
----------------------------------------------------------------------
diff --git a/ui/js/controllers/createjob-ac-ctrl.js b/ui/js/controllers/createjob-ac-ctrl.js
index 57aa240..f8a0350 100644
--- a/ui/js/controllers/createjob-ac-ctrl.js
+++ b/ui/js/controllers/createjob-ac-ctrl.js
@@ -102,7 +102,7 @@ define(['./module'], function(controllers) {
var year = $scope.jobStartTime.substr(0,4);
var month = $scope.jobStartTime.substr(4,2);
var day = $scope.jobStartTime.substr(6,2);
- startTime = year +'-'+ month + '-'+ day + ' '+ $scope.jobStartTime.split(' ')[0];
+ startTime = year +'-'+ month + '-'+ day + ' '+ $scope.jobStartTime.split(' ')[1];
startTime = Date.parse(startTime);
this.data={
"sourcePat":$scope.sourcePat,
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/b8eb67bb/ui/js/controllers/viewrule-ctrl.js
----------------------------------------------------------------------
diff --git a/ui/js/controllers/viewrule-ctrl.js b/ui/js/controllers/viewrule-ctrl.js
index 343a229..dfc3fcc 100644
--- a/ui/js/controllers/viewrule-ctrl.js
+++ b/ui/js/controllers/viewrule-ctrl.js
@@ -30,12 +30,12 @@ define(['./module'], function (controllers) {
$scope.sourceLength = $scope.ruleData.evaluateRule.rules.split('AND').length;
console.log($scope.sourceLength);
- console.log(JSON.parse($scope.ruleData.source.config));
- $scope.sourceDB = JSON.parse($scope.ruleData.source.config).database;
+ // console.log(JSON.parse($scope.ruleData.source.config));
+ $scope.sourceDB = $scope.ruleData.source.config.database;
console.log($scope.sourceDB);
- $scope.targetDB = JSON.parse($scope.ruleData.target.config).database;
- $scope.sourceTable = JSON.parse($scope.ruleData.source.config)["table.name"];
- $scope.targetTable = JSON.parse($scope.ruleData.target.config)["table.name"];
+ $scope.targetDB = $scope.ruleData.target.config.database;
+ $scope.sourceTable = $scope.ruleData.source.config["table.name"];
+ $scope.targetTable = $scope.ruleData.target.config["table.name"];
console.log($scope.targetTable);
console.log($scope.targetDB);
console.log($scope.ruleData.evaluateRule.rules.split('AND'));