flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mj...@apache.org
Subject flink git commit: [FLINK-2764] [WebClient] WebClient cannot display multiple Jobs
Date Tue, 29 Sep 2015 22:10:37 GMT
Repository: flink
Updated Branches:
  refs/heads/master 136347da8 -> 622c1be8c


[FLINK-2764] [WebClient] WebClient cannot display multiple Jobs

This closes #1181


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/622c1be8
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/622c1be8
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/622c1be8

Branch: refs/heads/master
Commit: 622c1be8c61c3a9a37c30454c717c99982edd236
Parents: 136347d
Author: mjsax <mjsax@apache.org>
Authored: Wed Sep 23 16:21:29 2015 +0200
Committer: mjsax <mjsax@apache.org>
Committed: Wed Sep 30 00:08:49 2015 +0200

----------------------------------------------------------------------
 .../apache/flink/client/web/JobsServlet.java    |  4 +--
 .../src/main/resources/web-docs/js/program.js   | 26 +++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/622c1be8/flink-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java
index abf3b3f..a8e3c79 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/web/JobsServlet.java
@@ -163,9 +163,9 @@ public class JobsServlet extends HttpServlet {
 							if (d == null) {
 								d = "No description provided.";
 							}
-							descriptions += "#_#" + d;
+							descriptions += "#" + d;
 						} catch (ProgramInvocationException e) {
-							descriptions += "#_#No description provided.";
+							descriptions += "#No description provided.";
 							continue;
 						}
 					}

http://git-wip-us.apache.org/repos/asf/flink/blob/622c1be8/flink-clients/src/main/resources/web-docs/js/program.js
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/resources/web-docs/js/program.js b/flink-clients/src/main/resources/web-docs/js/program.js
index ea593a2..683185d 100644
--- a/flink-clients/src/main/resources/web-docs/js/program.js
+++ b/flink-clients/src/main/resources/web-docs/js/program.js
@@ -133,42 +133,38 @@ function deleteJob(id)
 function createJobList(data)
 {
   var markup = "";
-  
-  var entries = data.split("#_#");
-  
-  var lines = entries[0].split("\n");
+   
+  var lines = data.split("\n");
   for (var i = 0; i < lines.length; i++)
   {
     if (lines[i] == null || lines[i].length == 0) {
       continue;
     }
     
-    var name = lines[i];
     var date = "unknown date";
     var assemblerClass = "<em>no entry class specified</em>";
     
     var tokens = lines[i].split("\t");
-    if (tokens.length > 0) {
-      name = tokens[0];
-      if (tokens.length > 1) {
-        date = tokens[1];
-        if (tokens.length > 2) {
-          assemblerClass = tokens[2];
-        }
+    var name = tokens[0];
+    if (tokens.length > 1) {
+      date = tokens[1];
+      if (tokens.length > 2) {
+        assemblerClass = tokens[2];
       }
     }
     
-    var classes = assemblerClass.split(",");
+    var entries = assemblerClass.split("#");
+    var classes = entries[0].split(",");
     
     markup += '<div id="job_' + name + '" class="JobListItems"><table class="table"><tr>';
     markup += '<td colspan="2"><p class="JobListItemsName">' + name + '</p></td>';
     markup += '<td><p class="JobListItemsDate">' + date + '</p></td>';
     markup += '<td width="30px"><img class="jobItemDeleteIcon" src="img/delete-icon.png"
width="24" height="24" /></td></tr>';
     
-    var i = 0;
+    var j = 0;
     for (var idx in classes) {
       markup += '<tr><td width="30px;"><input id="' + classes[idx] + '" class="jobItemCheckbox"
type="checkbox"></td>';
-      markup += '<td colspan="3"><p class="JobListItemsDate" title="' + entries[++i]
+ '">' + classes[idx] + '</p></td></tr>';
+      markup += '<td colspan="3"><p class="JobListItemsDate" title="' + entries[++j]
+ '">' + classes[idx] + '</p></td></tr>';
     }
     markup += '</table></div>';
   }


Mime
View raw message