Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin
diff --git a/ui/js/controllers/createjob-ac-ctrl.js b/ui/js/controllers/createjob-ac-ctrl.js
index 9008d26..e5e9457 100644
--- a/ui/js/controllers/createjob-ac-ctrl.js
+++ b/ui/js/controllers/createjob-ac-ctrl.js
@@ -139,7 +139,6 @@
var timestamp = Date.parse(date);
// timestamp = timestamp / 1000;
// var time = date.toDateString()+' '+date.toLocaleTimeString();
-// var jobName = $scope.Measures[$scope.measure] + '-BA-' + $scope.ntAccount + '-' + date.getFullYear() + '-'+ month + '-'+date.getDate();
var jobName = $scope.Measures[$scope.measure] + '-BA-' + $scope.ntAccount + '-' + timestamp;
var newJob = $config.uri.addJobs + this.data.groupName + '/' + jobName + '/' + $scope.Measures[$scope.measure];
diff --git a/ui/js/controllers/job-ctrl.js b/ui/js/controllers/job-ctrl.js
index dd6fcb6..1f070d1 100644
--- a/ui/js/controllers/job-ctrl.js
+++ b/ui/js/controllers/job-ctrl.js
@@ -39,6 +39,7 @@
if(start == 0 && !$scope.rowCollection){
$http.get(allJobs).then(function successCallback(data) {
+
angular.forEach(data.data,function(job){
job.name = job.jobName.split('-')[0] + '-' + job.jobName.split('-')[1] + '-' + job.jobName.split('-')[2];
job.createTime = job.jobName.split('-')[3];
diff --git a/ui/pages/jobs/createjob-ac.html b/ui/pages/jobs/createjob-ac.html
index 7ec12cb..727caea 100644
--- a/ui/pages/jobs/createjob-ac.html
+++ b/ui/pages/jobs/createjob-ac.html
@@ -41,9 +41,9 @@
</label>
<div class="col-md-10 col-lg-10 col-sm-10 ">
- <input type="text" class="form-control" ng-model="sourcePat" name="ruleName" placeholder="Please input the source partition, such as 'YYYYMMdd-HH'." required
- ng-pattern="/YYYYMMdd-HH/i"
- ng-maxlength='11'>
+ <input type="text" class="form-control" ng-model="sourcePat" name="ruleName" placeholder="Please input the source partition, such as 'YYYYMMdd-HH'." required
+ ng-pattern="/YYYYMMdd-HH/i"
+ ng-maxlength='11'>
<span class="error text-small block " ng-if="Form.ruleName.$dirty && Form.ruleName.$error.pattern">Please input partition like 'YYYYMMdd-HH'</span>
</div>
</div>
@@ -54,8 +54,8 @@
Target Partition<span class="symbol required"></span>:
</label>
<div class="col-md-10 col-lg-10 col-sm-10 ">
- <input type="text" class="form-control" ng-model="targetPat" placeholder="Please input target partition of your job, such as 'YYYYMMdd-HH'."
- required ng-pattern="/YYYYMMdd-HH/i" ng-maxlength='11' name="targetPat">
+ <input type="text" class="form-control" ng-model="targetPat" placeholder="Please input target partition of your job, such as 'YYYYMMdd-HH'."
+ required ng-pattern="/YYYYMMdd-HH/i" ng-maxlength='11' name="targetPat">
<span class="error text-small block " ng-if="Form.targetPat.$dirty && Form.targetPat.$error.pattern">Please input partition like 'YYYYMMdd-HH'</span>
</div>
</div>
@@ -91,9 +91,9 @@
</label>
<div class="col-md-5 col-lg-5 col-sm-5 ">
- <input type="text" id="systemSelector" class="form-control" ng-model="periodTime" required placeholder="How often it works"
- onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
- onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}">
+ <input type="text" id="systemSelector" class="form-control" ng-model="periodTime" required placeholder="How often it works"
+ onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+ onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}">
</div>
<div class="col-md-5 col-lg-5 col-sm-5 ">
<select id="timeSelector" class="form-control" ng-model="timeType" required>
