Added new url rules for each node by change NodeView class:

- Renamed the URL 'nodes' to 'children', because - we'll return the
  children for the current node.
- Using the URL 'nodes' to fetch all nodes of its type, when not
  specified the node-id, otherwise regenerate that node info using the
  node-id (it will be used by the refresh function).

- Added the URL 'msql' for fetching modified SQL for the modified
  objects.
- Separated the URL 'deps' (GET/POST methods) to 'dependency' and
  'dependent', because - it will be used to fetch the properties of the
  object, not manipulate it. (as suggested by Dave).

This commit includes the changes related to it in the specific nodes.
(i.e. server-group, and server).

Also, includes a javascript change to ask the user (if they really want
to leave the page, and it is not an accidental navigation by keyboard
shortcuts).

web/pgadmin/browser/server_groups/__init__.py

@@ -77,9 +77,16 @@ class ServerGroupView(NodeView):
 
     def list(self):
         res = []
-        for g in blueprint.get_nodes():
-            res.append(g)
-        return make_json_response(result=res)
+
+        for sg in ServerGroup.query.filter_by(
+                user_id=current_user.id
+                ):
+            res.append({
+                'id': sg.id,
+                'name': sg.name
+                })
+
+        return ajax_response(response=res, status=200)
 
     def delete(self, gid):
         """Delete a server group node in the settings database"""
@@ -221,5 +228,31 @@ class ServerGroupView(NodeView):
                 200, {'Content-Type': 'application/x-javascript'}
                 )
 
+    def nodes(self, gid=None):
+        """Return a JSON document listing the server groups for the user"""
+        nodes = []
+
+        if gid is None:
+            groups = ServerGroup.query.filter_by(user_id=current_user.id)
+        else:
+            groups = ServerGroup.query.filter_by(user_id=current_user.id,
+                    id=gid).first()
+
+        for group in groups:
+            nodes.append(
+                    self.generate_browser_node(
+                        "%d" % (group.id),
+                        group.name,
+                        "icon-%s" % self.node_type,
+                        True,
+                        self.node_type
+                        )
+                    )
+
+        return make_json_response(data=nodes)
+
+    def node(self, gid):
+        return self.nodes(gid)
+
 
 ServerGroupView.register_node_view(blueprint)

web/pgadmin/browser/server_groups/servers/__init__.py

@@ -103,19 +103,25 @@ class ServerNode(PGChildNodeView):
             {'get': 'properties', 'delete': 'delete', 'put': 'update'},
             {'get': 'list', 'post': 'create'}
         ],
-        'nodes': [{'get': 'nodes'}],
-        'sql': [{'get': 'sql', 'post': 'modified_sql'}],
+        'nodes': [{'get': 'node'}, {'get': 'nodes'}],
+        'sql': [{'get': 'sql'}],
+        'msql': [{'get': 'modified_sql'}],
         'stats': [{'get': 'statistics'}],
-        'deps': [{'get': 'dependencies', 'post': 'dependents'}],
+        'dependency': [{'get': 'dependencies'}],
+        'dependent': [{'get': 'dependents'}],
+        'children': [{'get': 'children'}],
         'module.js': [{}, {}, {'get': 'module_js'}],
         'connect': [{
             'get': 'connect_status', 'post': 'connect', 'delete': 'disconnect'
             }]
     })
 
-    def list(self, gid):
+    def nodes(self, gid):
         res = []
-        """Return a JSON document listing the server groups for the user"""
+        """
+        Return a JSON document listing the servers under this server group
+        for the user.
+        """
         servers = Server.query.filter_by(user_id=current_user.id,
                                          servergroup_id=gid)
 
@@ -136,12 +142,49 @@ class ServerNode(PGChildNodeView):
                     True,
                     self.node_type,
                     connected=connected,
-                    server_type=manager.server_type if connected else 'PG',
+                    server_type=manager.server_type if connected else 'pg',
                     version=manager.version
                     )
                 )
         return make_json_response(result=res)
 
+    def node(self, gid, sid):
+        """Return a JSON document listing the server groups for the user"""
+        server = Server.query.filter_by(user_id=current_user.id,
+                                         servergroup_id=gid,
+                                         id=sid).first()
+
+        if server is None:
+            return make_json_response(
+                    status=410,
+                    success=0,
+                    errormsg=gettext(
+                        gettext(
+                            "Couldn't find the server with id# %s!"
+                            ).format(sid)
+                    )
+                )
+
+        from pgadmin.utils.driver import get_driver
+        driver = get_driver(PG_DEFAULT_DRIVER).connection_manager(server.id)
+
+        conn = manager.connection()
+        connected = conn.connected()
+
+        return make_json_response(
+                result=self.blueprint.generate_browser_node(
+                    "%d" % (server.id),
+                    server.name,
+                    "icon-server-not-connected" if not connected else
+                    "icon-{0}".format(manager.server_type),
+                    True,
+                    self.node_type,
+                    connected=connected,
+                    server_type=manager.server_type if connected else 'pg',
+                    version=manager.version
+                    )
+                )
+
     def delete(self, gid, sid):
         """Delete a server node in the settings database."""
         servers = Server.query.filter_by(user_id=current_user.id, id=sid)
@@ -258,6 +301,47 @@ class ServerNode(PGChildNodeView):
             }
         )
 
+    def list(self, gid):
+        """
+        Return list of attributes of all servers.
+        """
+        servers = Server.query.filter_by(
+                user_id=current_user.id,
+                servergroup_id=gid)
+        sg = ServerGroup.query.filter_by(
+                user_id=current_user.id,
+                id=gid
+                ).first()
+        res = []
+
+        from pgadmin.utils.driver import get_driver
+        driver = get_driver(PG_DEFAULT_DRIVER)
+
+        for server in servers:
+            manager = driver.connection_manager(server.id)
+            conn = manager.connection()
+            connected = conn.connected()
+
+            res.append({
+                'id': server.id,
+                'name': server.name,
+                'host': server.host,
+                'port': server.port,
+                'db': server.maintenance_db,
+                'username': server.username,
+                'gid': server.servergroup_id,
+                'group-name': sg.name,
+                'comment': server.comment,
+                'role': server.role,
+                'connected': connected,
+                'version': manager.ver,
+                'server_type': manager.server_type if connected else 'pg'
+                })
+
+        return ajax_response(
+                response=res
+        )
+
     def properties(self, gid, sid):
         """Return list of attributes of a server"""
         server = Server.query.filter_by(
@@ -296,7 +380,7 @@ class ServerNode(PGChildNodeView):
                 'role': server.role,
                 'connected': connected,
                 'version': manager.ver,
-                'server_type': manager.server_type if connected else 'PG'
+                'server_type': manager.server_type if connected else 'pg'
             }
         )
 
@@ -348,7 +432,7 @@ class ServerNode(PGChildNodeView):
                         True,
                         self.node_type,
                         connected=False,
-                        server_type='PG'  # Default server type
+                        server_type='pg'  # Default server type
                         )
                     )