From faa984debc3f6aca2e347c39116ff7c9b2de0e90 Mon Sep 17 00:00:00 2001
From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
Date: Tue, 5 Jan 2016 02:15:22 +0530
Subject: [PATCH] Append the new node under the collection, when it should be.

---
 .../browser/templates/browser/js/node.js      | 47 ++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/web/pgadmin/browser/templates/browser/js/node.js b/web/pgadmin/browser/templates/browser/js/node.js
index 7995e83f4..28dfed595 100644
--- a/web/pgadmin/browser/templates/browser/js/node.js
+++ b/web/pgadmin/browser/templates/browser/js/node.js
@@ -798,13 +798,48 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
 
             if (that.parent_type) {
               if (tree.wasLoad(item)) {
-                tree.append(item, {
-                  itemData: d,
-                  success: function(i, o) {
-                    func(o.items.eq(0));
+                var first = tree.first(item, false),
+                    data = first && first.length && tree.itemData(first);
+
+                // We found the same type of object here, we can append it
+                // here.
+                if (data && data._type == that.type) {
+                  tree.append(item, {
+                    itemData: d,
+                    success: function(i, o) {
+                      func(o.items.eq(0));
+                    }
+                  });
+                } else {
+                  var children = tree.children(item, false, false);
+
+                  if (children) {
+                    var check = true;
+                    _.each(children, function(child) {
+                      if (!check)
+                        return;
+                      var j = $(child);
+                      data = tree.itemData(j);
+
+                      if (data && data._type && data._type in pgBrowser.Nodes) {
+                        node = pgBrowser.Nodes[data._type];
+
+                        if (node && node.node && node.node == that.type) {
+                          check = false;
+                          if (tree.wasLoad(j)) {
+                            tree.append(j, {
+                              itemData: d,
+                              success: function(i, o) {
+                                func(o.items.eq(0));
+                              }
+                            });
+                          }
+                        }
+                      }
+                    });
                   }
-                });
-              } else {
+                }
+
                 /* When no children found, it was loaded.
                  * It sets the item to non-inode.
                  */