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/04/05 02:05:03 UTC
[17/50] [abbrv] git commit: Now showing meta data and ports info.
Now showing meta data and ports info.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/9e6346b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/9e6346b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/9e6346b7
Branch: refs/heads/mansu/job_page
Commit: 9e6346b75909625e958c493311e51f137a2ab1a4
Parents: debaa91
Author: Suman Karumuri <sk...@twitter.com>
Authored: Fri Mar 28 15:14:43 2014 -0700
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Fri Mar 28 15:14:43 2014 -0700
----------------------------------------------------------------------
.../aurora/scheduler/http/ui/js/controllers.js | 21 +++++++++++++-------
.../scheduler/http/ui/schedulingDetail.html | 4 ++--
2 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/9e6346b7/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
index 9e60286..3c28407 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
@@ -457,8 +457,8 @@ auroraUIControllers.controller('JobController',
diskMb: task.diskMb,
isService: task.isService,
production: task.production,
- ports: _.sortBy(task.requestedPorts),
contact: task.contactEmail || '',
+ ports: _.sortBy(task.requestedPorts).join(', '),
constraints: _.chain(task.constraints)
.sortBy(function (constraint) {
return constraint.name;
@@ -467,10 +467,16 @@ auroraUIControllers.controller('JobController',
return formatConstraint(constraint);
})
.value()
- .join(','),
- metadata: _.sortBy(task.metadata, function (metadata) {
- return metadata.key;
- })
+ .join(', '),
+ metadata: _.chain(task.metadata)
+ .sortBy(function (metadata) {
+ return metadata.key;
+ })
+ .map(function (metadata) {
+ return metadata.key + ':' + metadata.value;
+ })
+ .value()
+ .join(', ')
};
}
@@ -503,7 +509,7 @@ auroraUIControllers.controller('JobController',
var limitConstraint = taskConstraint.limit ? JSON.stringify(taskConstraint.limit) : '';
- if(_.isEmpty(limitConstraint) && _.isEmpty(valueConstraint)) {
+ if (_.isEmpty(limitConstraint) && _.isEmpty(valueConstraint)) {
return '';
} else {
return constraint.name + ':' +
@@ -511,4 +517,5 @@ auroraUIControllers.controller('JobController',
}
}
}
-);
+)
+;
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/9e6346b7/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html
index 0ce7505..c1e689f 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html
@@ -11,8 +11,8 @@
<li ng-if='dataRow.schedulingDetail.ports'>
ports : {{dataRow.schedulingDetail.ports}}
</li>
- <li ng-if='dataRow.schedulingDetail.packages'>
- packages : {{dataRow.schedulingDetail.packages}}
+ <li ng-if='dataRow.schedulingDetail.metadata'>
+ metadata : {{dataRow.schedulingDetail.metadata}}
</li>
<li ng-if='dataRow.schedulingDetail.contact'>
contact : {{dataRow.schedulingDetail.contact}}