Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
CHUKWA-637. Fixed default cluster selection in hicc. (Eric Yang)
git-svn-id: https://svn.apache.org/repos/asf/incubator/chukwa/trunk@1369520 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
macroadster committed Aug 5, 2012
1 parent 518c4b5 commit b80b08ae7f3cc4a6194d25ace2658546ca2bd6b3
Showing 2 changed files with 13 additions and 2 deletions.
@@ -22,6 +22,8 @@ Trunk (unreleased changes)

BUGS

CHUKWA-637. Fixed default cluster selection in hicc. (Eric Yang)

CHUKWA-654. Added additional check for getting row key. (Saisai Shao via Eric Yang)

CHUKWA-652. Fixed JSON error in utilization.descriptor. (Saisai Shao via Eric Yang)
@@ -40,10 +40,13 @@
}
String cluster = "none";
try{
if(session.getAttribute("cluster")==null) {
if(session.getAttribute("cluster")==null ||
session.getAttribute("cluster").equals("none")) {
ClusterConfig cc = new ClusterConfig();
Iterator ci = cc.getClusters();
cluster = (String) ci.next();
} else {
cluster = (String) session.getAttribute("cluster");
}
} catch(Exception e) {
}
@@ -131,6 +134,9 @@ function toggle_view_all() {
<td align="left" nowrap class="portal_top_nav_bar" nowrap> </td></tr>
</table>
<% } %>
<% if(request.getParameter("embed")!=null) { %>
<div id="hide-menubar" style="display:none;">
<% } %>
<table width="100%" cellpadding=0 cellspacing=0 class="menubar">
<tr><td>
<div id="menu">
@@ -161,6 +167,9 @@ function toggle_view_all() {
</td><td align="right"><a href='#' onmouseover='javascript:build_permlink();' id='permlink' class='glossy_icon'><img id='permlink_icon' src='/hicc/images/server_link.png' border=0></a> <a href='#' onclick='toggle_view_all()' class='glossy_icon'><img id='view_all' src='/hicc/images/stop.png' border=0></a> <a href='#' onclick='_currentView.getCurrentPage().refresh_all();' class='glossy_icon'><img src='/hicc/images/refresh.png' border=0></a>&nbsp;</div>
</td></tr>
</table>
<% if(request.getParameter("embed")!=null) { %>
</div>
<% } %>
<table width="100%" cellpadding=0 cellspacing=0>
<tr><td colspan="3">
<!-- first page for manage view -->
@@ -217,7 +226,7 @@ Select the widget from the widget tree to see the detail.
</tr>
</table>
</td></tr>
<tr><td bgcolor="white" id="workspaceContainer" colspan="3">
<tr><td id="workspaceContainer" colspan="3">
<!-- content location -->
</td></tr>
</table>

0 comments on commit b80b08a

Please sign in to comment.