diff --git a/web/pgadmin/browser/templates/browser/js/browser.js b/web/pgadmin/browser/templates/browser/js/browser.js index 170e18eee..6e7202093 100644 --- a/web/pgadmin/browser/templates/browser/js/browser.js +++ b/web/pgadmin/browser/templates/browser/js/browser.js @@ -34,9 +34,13 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) { }; var processTreeData = function(payload) { - var data = JSON.parse(payload).data.sort(function(a, b) { - return pgAdmin.natural_sort(a.label, b.label, {'_type': a._type}); - }); + var data = JSON.parse(payload).data; + if (data.length && data[0]._type !== 'column' && + data[0]._type !== 'catalog_object_column') { + data = data.sort(function(a, b) { + return pgAdmin.natural_sort(a.label, b.label); + }); + } _.each(data, function(d){ d._label = d.label; d.label = _.escape(d.label); @@ -868,7 +872,7 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) { d = ctx.t.itemData(i); if ( pgAdmin.natural_sort( - d._label, _data._label, {'_type': d._type} + d._label, _data._label ) == 1 ) return true; @@ -893,7 +897,7 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) { d = ctx.t.itemData(i); if ( pgAdmin.natural_sort( - d._label, _data._label, {'_type': d._type} + d._label, _data._label ) != -1 ) return true; @@ -901,7 +905,7 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) { d = ctx.t.itemData(i); if ( pgAdmin.natural_sort( - d._label, _data._label, {'_type': d._type} + d._label, _data._label ) != 1 ) return true; @@ -910,7 +914,7 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) { d = ctx.t.itemData(i); if ( pgAdmin.natural_sort( - d._label, _data._label, {'_type': d._type} + d._label, _data._label ) == 1 ) { s = m + 1; diff --git a/web/pgadmin/static/js/pgadmin.js b/web/pgadmin/static/js/pgadmin.js index 414e7b8a1..7ab1e3fc8 100644 --- a/web/pgadmin/static/js/pgadmin.js +++ b/web/pgadmin/static/js/pgadmin.js @@ -40,11 +40,6 @@ oFxNcL, oFyNcL, mult = options.desc ? -1 : 1; - // If object is of column type then do not sort - if (options.hasOwnProperty("_type") && options._type && - (options._type == 'column' || options._type == 'catalog_object_column')) - return 0; - // first try and sort Hex codes or Dates if (yD) if ( xD < yD ) return -1 * mult;