You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/01/15 22:37:35 UTC
[12/50] [abbrv] git commit: Made getJobSummary a function.
Made getJobSummary a function.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/46762857
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/46762857
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/46762857
Branch: refs/heads/mansu/AURORA-4187_scheduler_home_page-no-seed
Commit: 4676285776e1f3e6b81df26f13b9898f228ca7e9
Parents: d5b5b96
Author: Suman Karumuri <sk...@twitter.com>
Authored: Mon Dec 30 23:07:54 2013 -0800
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Mon Jan 13 15:24:39 2014 -0800
----------------------------------------------------------------------
.../aurora/scheduler/http/ui/js/controllers.js | 2 +-
.../aurora/scheduler/http/ui/js/services.js | 32 +++++++++++---------
2 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/46762857/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js b/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js
index 0382ffc..fc6f467 100644
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js
+++ b/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/controllers.js
@@ -13,7 +13,7 @@ angular.module('auroraUI.controllers', []).
{label : 'Cron Jobs', map: 'cronJobs'}
];
- $scope.rowCollection = auroraClient.jobSummary.jobSummaries;
+ $scope.rowCollection = auroraClient.getJobSummary().jobSummaries;
$scope.globalConfig = {
isGlobalSearchActivated: true,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/46762857/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js b/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js
index 586451b..feeeb4f 100644
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js
+++ b/src/main/resources/com/twitter/aurora/scheduler/http/ui/js/services.js
@@ -1,21 +1,23 @@
'use strict';
auroraUI.factory(
- 'auroraClient', function () {
+ 'auroraClient',
+ function () {
return {
- jobSummary: { 'jobSummaries': [
- {
- 'role': "mesos",
- 'jobs': 10,
- 'cronJobs': 10
- },
- {
- 'role': 'ads',
- 'jobs': 101,
- 'cronJobs': 20
- }
- ]}
+ getJobSummary: function () {
+ return { 'jobSummaries': [
+ {
+ 'role': "mesos",
+ 'jobs': 10,
+ 'cronJobs': 10
+ },
+ {
+ 'role': 'ads',
+ 'jobs': 101,
+ 'cronJobs': 20
+ }
+ ]}
+ return
+ }
};
});
-
-