You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/07/21 10:05:53 UTC
[47/50] [abbrv] incubator-kylin git commit: KYLIN-888,
fix loading more jobs button lost issue
KYLIN-888,fix loading more jobs button lost issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1aebb1bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1aebb1bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1aebb1bf
Branch: refs/heads/master
Commit: 1aebb1bf73a8961539ec5ab65b64701a7ce3c5f9
Parents: 4da69de
Author: jiazhong <ji...@ebay.com>
Authored: Mon Jul 13 19:00:57 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Mon Jul 13 19:26:31 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/job.js | 3 +--
webapp/app/js/model/jobListModel.js | 6 ++++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1aebb1bf/webapp/app/js/controllers/job.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/job.js b/webapp/app/js/controllers/job.js
index 812316e..2303ce5 100644
--- a/webapp/app/js/controllers/job.js
+++ b/webapp/app/js/controllers/job.js
@@ -80,11 +80,10 @@ KylinApp
};
$scope.state.loading = true;
- var defer = $q.defer();
return JobList.list(jobRequest).then(function (resp) {
$scope.state.loading = false;
defer.resolve(resp);
- defer.promise;
+ return defer.promise;
});
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1aebb1bf/webapp/app/js/model/jobListModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/jobListModel.js b/webapp/app/js/model/jobListModel.js
index 61c5cc3..7dc8428 100755
--- a/webapp/app/js/model/jobListModel.js
+++ b/webapp/app/js/model/jobListModel.js
@@ -35,8 +35,10 @@ KylinApp.service('JobList', function (JobService, $q) {
_this.jobs[id] = job;
}
});
-
- defer.resolve(jobs.length);
+ _this.jobs = _this.jobs.concat(jobs);
+ defer.resolve(_this.jobs.length);
+ },function(){
+ defer.reject("failed to load jobs");
});
return defer.promise;