You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/31 02:04:07 UTC

[03/20] git commit: revert tablesorter fix

revert tablesorter fix


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

Branch: refs/heads/security
Commit: 8325186b731259c17d4b06aa2c288ffc4f6dc59b
Parents: 357fd09
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Wed Jun 25 15:32:17 2014 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Jun 25 15:32:17 2014 +0000

----------------------------------------------------------------------
 storm-core/src/ui/public/component.html | 22 ++++++----------------
 storm-core/src/ui/public/topology.html  |  4 +---
 2 files changed, 7 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8325186b/storm-core/src/ui/public/component.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/component.html b/storm-core/src/ui/public/component.html
index 092eb40..0951aed 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -80,32 +80,22 @@ $(document).ready(function() {
             componentSummary.append(Mustache.render($(template).filter("#component-summary-template").html(),response));
             if(response["componentType"] == "spout") {
                 componentStatsDetail.append(Mustache.render($(template).filter("#spout-stats-detail-template").html(),response));
-                if (response["spoutSummary"].length > 0) {
-                    $("#spout-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
-                }
+                $("#spout-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
                 outputStats.append(Mustache.render($(template).filter("#output-stats-template").html(),response));
-                if (response["outputStats"].length > 0) {
-                    $("#output-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
-                }
+                $("#output-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
                 executorStats.append(Mustache.render($(template).filter("#executor-stats-template").html(),response));
-                if (response["executorStats"].length > 0) {
-                    $("#executor-stats-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
-                }
+                $("#executor-stats-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
             } else {
                 componentStatsDetail.append(Mustache.render($(template).filter("#bolt-stats-template").html(),response));
-                if (response["boltStats"].length > 0) {
-                    $("#bolt-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
-                }
+                $("#bolt-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
                 inputStats.append(Mustache.render($(template).filter("#bolt-input-stats-template").html(),response));
                 if (response["inputStats"].length > 0) {
                     $("#bolt-input-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
                 }
                 outputStats.append(Mustache.render($(template).filter("#bolt-output-stats-template").html(),response));
-                if (response["outputStats"].length > 0) {
-                    $("#bolt-output-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
-                }
+                $("#bolt-output-stats-table").tablesorter({ sortList: [[0,0]], headers: {}});
                 executorStats.append(Mustache.render($(template).filter("#bolt-executor-template").html(),response));
-                if(response["executorStats"].length > 0) {
+                if(response["outputStats"].length > 0) {
                     $("#bolt-executor-table").tablesorter({ sortList: [[0,0]], headers: {}});
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8325186b/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index db1a500..74afb08 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -89,9 +89,7 @@ $(document).ready(function() {
             topologySummary.append(Mustache.render($(template).filter("#topology-summary-template").html(),response));
             topologyActions.append(Mustache.render($(template).filter("#topology-actions-template").html(),buttonJsonData));
             topologyStats.append(Mustache.render($(template).filter("#topology-stats-template").html(),response));
-            if(response["topologyStats"].length > 0) {
-                $("#topology-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
-            }
+            $("#topology-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
             spoutStats.append(Mustache.render($(template).filter("#spout-stats-template").html(),response));
             if(response["spouts"].length > 0) {
                 $("#spout-stats-table").tablesorter({sortList: [[0,0]], headers:{}});