You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2009/09/22 10:56:19 UTC

svn commit: r817552 - in /geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main: java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java webapp/WEB-INF/view/monitoringEditView.jsp

Author: rwonly
Date: Tue Sep 22 08:56:19 2009
New Revision: 817552

URL: http://svn.apache.org/viewvc?rev=817552&view=rev
Log:
GERONIMO-4863 no other graphs can be chosen when I click "Modify this view" of a view (patch from Siqi Du)

Modified:
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java?rev=817552&r1=817551&r2=817552&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java Tue Sep 22 08:56:19 2009
@@ -363,11 +363,13 @@
             String view_id = request.getParameter("view_id");
             request.setAttribute("view_id", view_id);
             addViewAttribute(request, false);
+            addAllGraphsAttribute(request);
             editView.include(request, response);
         } else if (action.equals("saveEditView")) {
             String view_id = request.getParameter("view_id");
             request.setAttribute("view_id", view_id);
             addViewAttribute(request, false);
+            addAllGraphsAttribute(request);
             editView.include(request, response);
         } else if (action.equals("showAddView")) {
             addAllGraphsAttribute(request);
@@ -574,6 +576,28 @@
                 View view = entityManager.find(View.class, Integer.parseInt(view_id));
                 view.setName(actionRequest.getParameter("name"));
                 view.setDescription(actionRequest.getParameter("minxss_description"));
+                for(Graph graph: view.getGraphs())
+                {
+                    for(View view_in : graph.getViews())
+                    {
+                        if(view_in.getId() == view.getId())
+                        {//No grantee for that view and view_in have the same reference?
+                            graph.getViews().remove(view_in);
+                            break;
+                        }
+                    }
+                }
+                view.getGraphs().clear();
+                
+                String[] graphsArray = actionRequest.getParameterValues("graph_ids");
+                if (graphsArray != null) {
+                    for (String graphIdString: graphsArray) {
+                        int graphId = Integer.parseInt(graphIdString);
+                        Graph graph = entityManager.find(Graph.class, graphId);
+                        view.getGraphs().add(graph);
+                        graph.getViews().add(view);
+                    }
+                }
             } finally {
                 userTransaction.commit();
             }

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp?rev=817552&r1=817551&r2=817552&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp Tue Sep 22 08:56:19 2009
@@ -21,6 +21,7 @@
 <%@ page import="org.apache.geronimo.monitoring.console.Constants" %>
 <%@ page import="org.apache.geronimo.monitoring.console.data.Graph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.data.View" %>
+<%@ page import="java.util.List,java.util.ArrayList"%>
 <fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 
@@ -106,13 +107,19 @@
             <th><fmt:message key="monitor.common.edit"/></th>
             </tr>
       <%
-          for (Graph graph: view.getGraphs()) {
+          List<Integer> owned_ids = new ArrayList<Integer>();
+          for(Graph graph : view.getGraphs())
+          {
+             owned_ids.add(graph.getId());
+          }
+          List<Graph> graphs = (List<Graph>) request.getAttribute("graphs");
+          for (Graph graph: graphs) {
               if (graph.getNode() != null)
               {
       %>     
             <tr>
-            <%--<td align="left" width="5%"><input type="checkbox" name="graph_ids" title="<%=graph.getGraphName1()%> - <%=graph.getNode().getName()%>" id="<portlet:namespace/>graph_ids" value='<%=graph.getIdString()%>' <%if (graphsList.contains(rs.getInt("graph_id"))){%> checked<%}%>></td>--%>
-            <td align="left" width="5%"><input type="checkbox" name="graph_ids" title="<%=graph.getGraphName1()%> - <%=graph.getNode().getName()%>" id="<portlet:namespace/>graph_ids" value='<%=graph.getIdString()%>' <%if (true){%> checked<%}%>></td>
+            <td align="left" width="5%"><input type="checkbox" name="graph_ids" title="<%=graph.getGraphName1()%> - <%=graph.getNode().getName()%>" id="<portlet:namespace/>graph_ids" value='<%=graph.getIdString()%>' <%if (owned_ids.contains(graph.getId())){%> checked<%}%>></td>
+        <%--<td align="left" width="5%"><input type="checkbox" name="graph_ids" title="<%=graph.getGraphName1()%> - <%=graph.getNode().getName()%>" id="<portlet:namespace/>graph_ids" value='<%=graph.getIdString()%>' <%if (true){%> checked<%}%>></td>--%>
             <td align="left"><a href="javascript: void(0)" onClick="openNewWindow('/monitoring/popUpGraph?graph_id=<%=graph.getIdString()%>','graph','width=800,height=300','title=<%=graph.getGraphName1() %>')"><%=graph.getGraphName1()%></a></td>
             <td align="left"><%="" + graph.getTimeFrame()%> min.</td>
             <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value='<%=graph.getNode().getName()%>' /></portlet:actionURL>"><%=graph.getNode().getName()%></a></td>