Return-Path: 
 <scm-return-24082-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 47738 invoked from network); 19 Dec 2007 20:19:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 Dec 2007 20:19:56 -0000
Received: (qmail 74542 invoked by uid 500); 19 Dec 2007 20:19:45 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 74505 invoked by uid 500); 19 Dec 2007 20:19:45 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 74494 invoked by uid 99); 19 Dec 2007 20:19:45 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2007 12:19:45 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2007 20:19:31 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 10BC01A9832; Wed, 19 Dec 2007 12:19:35 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r605678 - in
 /geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view:
 monitoringAddView.jsp monitoringEditGraph.jsp monitoringEditView.jsp
Date: Wed, 19 Dec 2007 20:19:34 -0000
To: scm@geronimo.apache.org
From: ecraig@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071219201935.10BC01A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ecraig
Date: Wed Dec 19 12:19:33 2007
New Revision: 605678

URL: http://svn.apache.org/viewvc?rev=605678&view=rev
Log:
GERONIMO-3713
monitoring client is not displaying graph names on 'edit view' page 
properly.



Modified:
    geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
    geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
    geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp

Modified: geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp?rev=605678&r1=605677&r2=605678&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp Wed Dec 19 12:19:33 2007
@@ -127,7 +127,7 @@
       %>     
             <tr>
             <td align="left" width="5%"><input type="checkbox" name="graph_ids" value="<%=rs.getString("graph_id")%>"></td>
-            <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>" /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
+            <td align="left"><a href="/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>" target="window.open('','','width=670,height=220,resizable=1')"><%=rs.getString("name")%></a></td>
             <td align="left"><%=rs.getString("timeframe")%> min.</td>
             <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=rs.getString("server_id")%>" /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
             <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>

Modified: geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp?rev=605678&r1=605677&r2=605678&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp Wed Dec 19 12:19:33 2007
@@ -548,25 +548,25 @@
       <td>&nbsp;</td>
         <td align="right">
       <select name="operation" onChange="checkOtherMath(); updateFormula();">
-        <option value="" <%if (operation.equals("null")){  %>selected="selected"<%} %>>none</option>
+        <option value="" <%if (operation.equals("null") || operation.equals("") || operation == null){  %>selected="selected"<%} %>>none</option>
         <option value="+" <%if (operation.equals("+")){  %>selected="selected"<%} %>>+</option>
         <option value="-" <%if (operation.equals("-")){  %>selected="selected"<%} %>>-</option>
         <option value="*" <%if (operation.equals("*")){  %>selected="selected"<%} %>>*</option>
         <option value="/" <%if (operation.equals("/")){  %>selected="selected"<%} %>>/</option>
-        <option value="other" <%if (!operation.equals("null") && !operation.equals("+") && !operation.equals("-") && !operation.equals("*") && !operation.equals("/")){  %>selected="selected"<%} %>>Other</option>
+        <option value="other" <%if (!operation.equals("null") && !operation.equals("+") && !operation.equals("-") && !operation.equals("*") && !operation.equals("/") && !operation.equals("") && operation != null){  %>selected="selected"<%} %>>Other</option>
       </select>
       </td>
-      <td><input type="text" <%if (!operation.equals("null") && !operation.equals("+") && !operation.equals("-") && !operation.equals("*") && !operation.equals("/")){  %><%} else {%>style="display: none;"<%}%> width="6" size="8" name="othermath" onKeyUp='noAlphaMath(this); updateFormula();' onKeyPress='noAlphaMath(this); updateFormula();' value="<%=operation %>"/></td>
+      <td><input type="text" <%if (!operation.equals("null") && !operation.equals("+") && !operation.equals("-") && !operation.equals("*") && !operation.equals("/") && !operation.equals("") && operation != null){  %><%} else {%>style="display: none;"<%}%> width="6" size="8" name="othermath" onKeyUp='noAlphaMath(this); updateFormula();' onKeyPress='noAlphaMath(this); updateFormula();' value="<%=operation %>"/></td>
     </tr>
     <tr>
       <td>Data series 2:</td>
       <td>&nbsp;</td>
       <td align="right">
-      <select name="data2operation" <%if (operation.equals("null")){  %>disabled="disabled"<%} %> onchange="updateFormula();">
+      <select name="data2operation" <%if (operation.equals("null") || operation.equals("") || operation == null){  %>disabled="disabled"<%} %> onchange="updateFormula();">
         <option value="A" <%if (data2operation.equals("A")){  %>selected="selected"<%} %>>As-is</option>
         <option value="D" <%if (data2operation.equals("D")){  %>selected="selected"<%} %>>Change (Delta) in</option>
       </select>
-      <select name="dataname2" <%if (operation.equals("null")){  %>disabled="disabled"<%} %> onchange=" checkNoData2(); updateFormula();">
+      <select name="dataname2" <%if (operation.equals("null") || operation.equals("") || operation == null){  %>disabled="disabled"<%} %> onchange=" checkNoData2(); updateFormula();">
         <option value="">-Select Operation First-</option>
       </select>
       <script type='text/javascript'>

Modified: geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp?rev=605678&r1=605677&r2=605678&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp Wed Dec 19 12:19:33 2007
@@ -160,9 +160,7 @@
       %>     
             <tr>
             <td align="left" width="5%"><input type="checkbox" name="graph_ids" value="<%=rs.getString("graph_id")%>" <%if (graphsList.contains(rs.getInt("graph_id"))){%> checked<%}%>></td>
-            <td align="left">
-                <a href="/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>" target="window.open('','','width=670,height=220,resizable=1')"><%=name %></a>
-            </td>
+            <td align="left"><a href="/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>" target="window.open('','','width=670,height=220,resizable=1')"><%=rs.getString("name")%></a></td>
             <td align="left"><%=rs.getString("timeframe")%> min.</td>
             <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=rs.getString("server_id")%>" /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
             <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>