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:34 UTC
[11/50] [abbrv] git commit: Moved job summary data into a service.
Moved job summary data into a service.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/d5b5b967
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/d5b5b967
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/d5b5b967
Branch: refs/heads/mansu/AURORA-4187_scheduler_home_page-no-seed
Commit: d5b5b967bb3665e655572ac1e22d6fd0ddacebd5
Parents: 3dfe400
Author: Suman Karumuri <sk...@twitter.com>
Authored: Mon Dec 30 20:07:10 2013 -0800
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Mon Jan 13 15:24:39 2014 -0800
----------------------------------------------------------------------
.../twitter/aurora/scheduler/http/ui/index.html | 1 +
.../aurora/scheduler/http/ui/js/controllers.js | 17 ++---------------
.../aurora/scheduler/http/ui/js/services.js | 18 ++++++++++++++++++
3 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d5b5b967/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html
----------------------------------------------------------------------
diff --git a/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html b/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html
index 868a1d8..620aca3 100644
--- a/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html
+++ b/src/main/resources/com/twitter/aurora/scheduler/http/ui/index.html
@@ -26,6 +26,7 @@
<script src="/js/app.js"></script>
<script src="/js/controllers.js"></script>
<script src="/js/directives.js"></script>
+<script src="/js/services.js"></script>
<!-- Bootstrap -->
<script src="/js/bootstrap.min.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d5b5b967/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 134b59c..0382ffc 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
@@ -4,29 +4,16 @@
angular.module('auroraUI.controllers', []).
controller('AuroraUI.JobSummaryController',
- function ($scope, $window) {
+ function ($scope, $window, auroraClient) {
$scope.title = 'Scheduled Jobs Summary';
- $scope.jobSummary = { 'jobSummaries': [
- {
- 'role': "mesos",
- 'jobs': 10,
- 'cronJobs': 10
- },
- {
- 'role': 'ads',
- 'jobs': 101,
- 'cronJobs': 20
- }
- ]};
-
$scope.columnCollection = [
{label : 'Role', map: 'role', cellTemplateUrl: 'roleLink.html'},
{label : 'Jobs', map: 'jobs'},
{label : 'Cron Jobs', map: 'cronJobs'}
];
- $scope.rowCollection = $scope.jobSummary.jobSummaries;
+ $scope.rowCollection = auroraClient.jobSummary.jobSummaries;
$scope.globalConfig = {
isGlobalSearchActivated: true,
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d5b5b967/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 429d26d..586451b 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,3 +1,21 @@
'use strict';
+auroraUI.factory(
+ 'auroraClient', function () {
+ return {
+ jobSummary: { 'jobSummaries': [
+ {
+ 'role': "mesos",
+ 'jobs': 10,
+ 'cronJobs': 10
+ },
+ {
+ 'role': 'ads',
+ 'jobs': 101,
+ 'cronJobs': 20
+ }
+ ]}
+ };
+ });
+