MIME-Version: 1.0
From: Khushboo Vashi <khushboo.vashi@enterprisedb.com>
Date: Fri, 15 Oct 2021 16:09:26 +0530
Message-ID: 
 <CAFOhELcFug_1N5m=VSEC4_usYXr145hNXEyph8ip7-RhduVtQw@mail.gmail.com>
Subject: [pgAdmin4][Patch] - RM #6912 - pgadmin 6.0: browser tree sort order
 regression
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="000000000000d9162305ce61cfa2"
Archived-At: 
 <https://www.postgresql.org/message-id/CAFOhELcFug_1N5m%3DVSEC4_usYXr145hNXEyph8ip7-RhduVtQw%40mail.gmail.com>
Precedence: bulk

--000000000000d9162305ce61cfa2
Content-Type: multipart/alternative; boundary="000000000000d9162205ce61cfa0"

--000000000000d9162205ce61cfa0
Content-Type: text/plain; charset="UTF-8"

Hi,

Please find the attached patch to fix the RM #6912 - pgadmin 6.0: browser
tree sort order regression.

Thanks,
Khushboo

--000000000000d9162205ce61cfa0
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><font face=3D"arial, sans-serif" color=3D"#000000">Hi,</fo=
nt><div><font face=3D"arial, sans-serif" color=3D"#000000"><br></font></div=
><div><font face=3D"arial, sans-serif" color=3D"#000000">Please find the at=
tached patch to fix the RM #6912 -=C2=A0</font><span style=3D"color:rgb(0,0=
,0);font-family:arial,sans-serif">pgadmin 6.0: browser tree sort order regr=
ession.</span></div><div class=3D"gmail-subject" style=3D""><div style=3D""=
><font face=3D"arial, sans-serif" color=3D"#000000"><br></font></div><div s=
tyle=3D""><font face=3D"arial, sans-serif" color=3D"#000000">Thanks,</font>=
</div><div style=3D""><font face=3D"arial, sans-serif" style=3D"" color=3D"=
#000000">Khushboo</font></div></div></div>

--000000000000d9162205ce61cfa0--

--000000000000d9162305ce61cfa2
Content-Type: application/octet-stream; name="RM_6912.patch"
Content-Disposition: attachment; filename="RM_6912.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kus8napx0>
X-Attachment-Id: f_kus8napx0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy90cmVlL3RyZWVfaW5pdC50c3ggYi93
ZWIvcGdhZG1pbi9zdGF0aWMvanMvdHJlZS90cmVlX2luaXQudHN4CmluZGV4IGE5YTY4OTJlMy4u
ODlhMjVmZTJlIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvdHJlZS90cmVlX2lu
aXQudHN4CisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy90cmVlL3RyZWVfaW5pdC50c3gKQEAg
LTEzLDggKzEzLDkgQEAgaW1wb3J0IHsgRmlsZVRyZWVYLCBUcmVlTW9kZWxYIH0gZnJvbSAncGdh
ZG1pbjQtdHJlZSc7CiBpbXBvcnQge1RyZWV9IGZyb20gJy4vdHJlZSc7CiAKIGltcG9ydCB7IElC
YXNpY0ZpbGVTeXN0ZW1Ib3N0IH0gZnJvbSAncmVhY3QtYXNwZW4nOwotaW1wb3J0IHsgTWFuYWdl
VHJlZU5vZGVzIH0gZnJvbSAnLi90cmVlX25vZGVzJwotaW1wb3J0IHsgRGlyZWN0b3J5IH0gZnJv
bSAncmVhY3QtYXNwZW4nCitpbXBvcnQgeyBNYW5hZ2VUcmVlTm9kZXMgfSBmcm9tICcuL3RyZWVf
bm9kZXMnOworaW1wb3J0IHsgRGlyZWN0b3J5IH0gZnJvbSAncmVhY3QtYXNwZW4nOworaW1wb3J0
IHBnQWRtaW4gZnJvbSAnc291cmNlcy9wZ2FkbWluJzsKIAogdmFyIGluaXRCcm93c2VyVHJlZSA9
IGFzeW5jIChwZ0Jyb3dzZXIpID0+IHsKICAgY29uc3QgTU9VTlRfUE9JTlQgPSAnL2Jyb3dzZXIn
CkBAIC0zNiwxMyArMzcsMTEgQEAgdmFyIGluaXRCcm93c2VyVHJlZSA9IGFzeW5jIChwZ0Jyb3dz
ZXIpID0+IHsKICAgICAgIGlmIChhLl9tZXRhZGF0YSAmJiBhLl9tZXRhZGF0YS5kYXRhLl90eXBl
ID09ICdjb2x1bW4nKSByZXR1cm4gMDsKICAgICAgIC8vIFNvcnQgYWxwaGFiZXRpY2FsbHkKICAg
ICAgIGlmIChhLmNvbnN0cnVjdG9yID09PSBiLmNvbnN0cnVjdG9yKSB7Ci0gICAgICAgIHJldHVy
biBhLmZpbGVOYW1lID4gYi5maWxlTmFtZSA/IDEKLSAgICAgICAgICA6IGEuZmlsZU5hbWUgPCBi
LmZpbGVOYW1lID8gLTEKLSAgICAgICAgICA6IDAKLSAgICAgICAgfQotICAgICAgICByZXR1cm4g
YS5jb25zdHJ1Y3RvciA9PT0gRGlyZWN0b3J5ID8gLTEKLSAgICAgICAgICA6IGIuY29uc3RydWN0
b3IgPT09IERpcmVjdG9yeSA/IDEKLSAgICAgICAgICA6IDAKKyAgICAgICAgcmV0dXJuIHBnQWRt
aW4ubmF0dXJhbF9zb3J0KGEuZmlsZU5hbWUsIGIuZmlsZU5hbWUpOworICAgICAgfQorICAgICAg
cmV0dXJuIGEuY29uc3RydWN0b3IgPT09IERpcmVjdG9yeSA/IC0xCisgICAgICAgIDogYi5jb25z
dHJ1Y3RvciA9PT0gRGlyZWN0b3J5ID8gMQorICAgICAgICA6IDAKIAl9LAogICB9CiAK
--000000000000d9162305ce61cfa2--