aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [01/50] [abbrv] git commit: Added a link to the task sandbox.
Date Sat, 05 Apr 2014 00:04:47 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/mansu/job_page c3429fdb2 -> 45b21730a


Added a link to the task sandbox.


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/a55cb10c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/a55cb10c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/a55cb10c

Branch: refs/heads/mansu/job_page
Commit: a55cb10c2e2b23fc964ebd2ca0b747d0341544ed
Parents: 232452e
Author: Suman Karumuri <skarumuri@twitter.com>
Authored: Tue Mar 25 20:00:37 2014 -0700
Committer: Suman Karumuri <skarumuri@twitter.com>
Committed: Tue Mar 25 20:00:37 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/aurora/scheduler/http/ServletModule.java | 1 +
 .../org/apache/aurora/scheduler/http/ui/js/controllers.js    | 7 ++++---
 .../org/apache/aurora/scheduler/http/ui/js/directives.js     | 8 ++++++++
 .../org/apache/aurora/scheduler/http/ui/taskSandbox.html     | 1 +
 4 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a55cb10c/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index e3a0021..631768f 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -200,6 +200,7 @@ public class ServletModule extends AbstractModule {
     registerAsset("ui/breadcrumb.html", "/breadcrumb.html");
     registerAsset("ui/error.html", "/error.html");
     registerAsset("ui/job.html", "/job.html");
+    registerAsset("ui/taskSandbox.html", "/taskSandbox.html");
 
     registerAsset("ui/css/app.css", "/css/app.css");
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a55cb10c/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 09369d1..46b2bd1 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
@@ -300,7 +300,7 @@ auroraUIControllers.controller('JobController',
         formatFunction: function (date) {
           return fromNow(date);
         }},
-      {label: 'Host', map: 'host'}
+      {label: 'Host', map: 'host', cellTemplateUrl: '/taskSandbox.html'}
     ];
 
     $scope.completedTasksTableConfig = globalTableConfig;
@@ -316,7 +316,7 @@ auroraUIControllers.controller('JobController',
         formatFunction: function (date) {
           return fromNow(date);
         }},
-      {label: 'Host', map: 'host'}
+      {label: 'Host', map: 'host', cellTemplateUrl: '/taskSandbox.html'}
     ];
 
     $scope.completedTasks = [];
@@ -362,7 +362,8 @@ auroraUIControllers.controller('JobController',
             duration: isActive || _.isUndefined(runningTaskEvent)
               ? 0
               : lastTaskTimestamp - runningTaskEvent.timestamp,
-            isActive: isActive
+            isActive: isActive,
+            taskId: task.assignedTask.taskId
           };
         })
         .value();

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a55cb10c/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
index c7f344c..9f0c56a 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
@@ -35,3 +35,11 @@ auroraUI.directive('error', function () {
     templateUrl: '/error.html'
   };
 });
+
+auroraUI.directive('taskSandboxLink', function () {
+  return {
+    restrict: 'C',
+    template:
+      '<a ng-href="http://{{formatedValue}}:1338/task/{{dataRow.taskId}}">{{formatedValue}}</a>'
+  };
+});

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/a55cb10c/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
new file mode 100644
index 0000000..1c7c716
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskSandbox.html
@@ -0,0 +1 @@
+<div class="task-sandbox-link"></div>
\ No newline at end of file


Mime
View raw message