Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bKlVS-0006Pr-Tt for pgadmin-hackers@arkaria.postgresql.org; Wed, 06 Jul 2016 12:00:43 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bKlVR-0000Sa-SA for pgadmin-hackers@arkaria.postgresql.org; Wed, 06 Jul 2016 12:00:41 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bKlVD-0000EF-Dz for pgadmin-hackers@postgresql.org; Wed, 06 Jul 2016 12:00:27 +0000 Received: from mail-oi0-x22b.google.com ([2607:f8b0:4003:c06::22b]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bKlVA-0003Re-EX for pgadmin-hackers@postgresql.org; Wed, 06 Jul 2016 12:00:25 +0000 Received: by mail-oi0-x22b.google.com with SMTP id f189so267470599oig.3 for ; Wed, 06 Jul 2016 05:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=PrbrL3QGjghrEs9RdiQ81gojSo+rqYk6r5tFgeTE/gs=; b=RUhllSn3JDXWI5rrFSTVu3pl/v+oCZIcrIDAl6qLvdPL0QYTWyrwBJ3P6RMKzqBj3n 2CbgplCPV8U55XA88Q27sr9f7ZQGtjYLfBWdkRmt9S9JqzyJPmyn8fSjDfwISBa3/s8B AyHfwUOpHk1T3WAEBLyW8DjpC3n4a+N0d1+IMmxx1J6lSiLiAx1Vo04/EbtKzEa+gzDu qScNPeQfxgK58SyvvzljjoFfXoxohPQRDxoI3MNz48sz9dBWRlq269pZcAl8SZcujPeU 5lfobB/2tvoN9lny1oxvXWpnQSseaxqd/SHY6IL9TwlMApbwEpvO5RCbKv90nN7Xi7Kb IbVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=PrbrL3QGjghrEs9RdiQ81gojSo+rqYk6r5tFgeTE/gs=; b=Hj/TXjcFmY+BHCRrJleWQg4Qj0hJqjra8S/DgshbUBhWx+C3cj0RvivlYKvfkgXenX nHeIIDUsOtxUFVGPL3mpxSCBiOire2ctYcm9XKbNSUEfFwOcHWE1+IUfOA8en02tXESE eXZAG+pJPS474UD4LeqY0R7mwBb+1UytDFWNMXqGKqLqlSKDGpK+t5LHz6IEZP9TC/L5 on5i+H+Av5Go4pp17dEIXepHbiRW85ypEYS6PNMhd0zEFB31DG1qMiKLJY0qchM9oItO 0CreBG8tQUtmpcwBXii89MD67Smp7Rk73rzzwjk9h4YGQH5Y3iO5prdLzpEUWQhae6Pw HIcw== X-Gm-Message-State: ALyK8tLPNqwOb5+mIJ6/x7GmG6vZogAXYJztI+g+GYynNS0ghPzuS4aZl8sByQ/r6R1hy9Qmih/1w1Lxq2N/nvvt X-Received: by 10.157.19.39 with SMTP id f36mr3858820ote.53.1467806423180; Wed, 06 Jul 2016 05:00:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.5.100 with HTTP; Wed, 6 Jul 2016 05:00:22 -0700 (PDT) From: Harshal Dhumal Date: Wed, 6 Jul 2016 17:30:22 +0530 Message-ID: Subject: patch for issue RM1260 [pgAdmin4] To: pgadmin-hackers Content-Type: multipart/mixed; boundary=001a113cfd8a74331c0536f65077 X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --001a113cfd8a74331c0536f65077 Content-Type: multipart/alternative; boundary=001a113cfd8a7433180536f65075 --001a113cfd8a7433180536f65075 Content-Type: text/plain; charset=UTF-8 Hi, PFA patch for issue RM1260. Changes: Issue wasn't related to foreign table but was due the Select2 control. Now I have improved select2 control to handle null value in multi-select mode. Initial it was returning "null" instead it should return [] (empty array). -- *Harshal Dhumal* *Software Engineer* EnterpriseDB India: http://www.enterprisedb.com The Enterprise PostgreSQL Company --001a113cfd8a7433180536f65075 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch for issue RM1260.
=
Changes: Issue wasn't related to foreign table but was due th= e Select2 control. Now I have improved select2 control to handle null value= in multi-select mode. Initial it was returning "null" instead it= should return [] (empty array).


--=C2=A0
Ha= rshal Dhumal
Software Engineer

Enterprise= DB India:=C2=A0http://www.enterprise= db.com
The Enterprise PostgreSQL Comp= any
<= /div>
--001a113cfd8a7433180536f65075-- --001a113cfd8a74331c0536f65077 Content-Type: text/x-patch; charset=US-ASCII; name="RM1260.patch" Content-Disposition: attachment; filename="RM1260.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iqau14em0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3Rl bXBsYXRlcy9mb3JlaWduX3RhYmxlcy9qcy9mb3JlaWduX3RhYmxlcy5qcyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9mb3Jl aWduX3RhYmxlcy9qcy9mb3JlaWduX3RhYmxlcy5qcwppbmRleCBhNGI1YTI3 Li4yNjQxOGE2IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWdu X3RhYmxlcy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvanMvZm9yZWlnbl90 YWJsZXMuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMv dGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL2pzL2ZvcmVpZ25fdGFibGVzLmpz CkBAIC0yNjYsMTIgKzI2Niw2IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRt aW4sIHBnQnJvd3NlciwgYWxlcnRpZnkpIHsKICAgKi8KIAogICB2YXIgTm9k ZUFqYXhPcHRpb25zTXVsdGlwbGVDb250cm9sID0gQmFja2Zvcm0uTm9kZUFq YXhPcHRpb25zTXVsdGlwbGVDb250cm9sID0gQmFja2Zvcm0uTm9kZUFqYXhP cHRpb25zQ29udHJvbC5leHRlbmQoewotICAgIHRlbXBsYXRlOiBfLnRlbXBs YXRlKFsKLSAgICAgICc8bGFiZWwgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRy b2xMYWJlbENsYXNzTmFtZSU+Ij48JT1sYWJlbCU+PC9sYWJlbD4nLAotICAg ICAgJzxkaXYgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xzQ2xhc3NOYW1l JT4gPCU9ZXh0cmFDbGFzc2VzLmpvaW4oXCcgXCcpJT4iPicsCi0gICAgICAn ICA8c2VsZWN0IGNsYXNzPSJwZ2FkbWluLW5vZGUtc2VsZWN0IGZvcm0tY29u dHJvbCIgbmFtZT0iPCU9bmFtZSU+IiBzdHlsZT0id2lkdGg6MTAwJTsiIHZh bHVlPTwlLXZhbHVlJT4gPCU9ZGlzYWJsZWQgPyAiZGlzYWJsZWQiIDogIiIl PiA8JT1yZXF1aXJlZCA/ICJyZXF1aXJlZCIgOiAiIiU+ID4nLAotICAgICAg JyAgPC9zZWxlY3Q+JywKLSAgICAgICc8L2Rpdj4nXS5qb2luKCJcbiIpKSwK ICAgICBkZWZhdWx0czogXy5leHRlbmQoCiAgICAgICB7fSwgQmFja2Zvcm0u Tm9kZUFqYXhPcHRpb25zQ29udHJvbC5wcm90b3R5cGUuZGVmYXVsdHMsCiAg ICAgICB7CkBAIC0zMzEsMTEgKzMyNSw3IEBAIGZ1bmN0aW9uKCQsIF8sIFMs IHBnQWRtaW4sIHBnQnJvd3NlciwgYWxlcnRpZnkpIHsKICAgICAgICAgdGhp cy4kZWwuYWRkQ2xhc3MoQmFja2Zvcm0uaGlkZGVuQ2xhc3NuYW1lKTsKICAg ICAgICAgfSBlbHNlIHsKICAgICAgICAgdmFyIG9wdHMgPSBfLmV4dGVuZCgK LSAgICAgICAgICB7fSwgdGhpcy5kZWZhdWx0cy5zZWxlY3QyLCBkYXRhLnNl bGVjdDIsCi0gICAgICAgICAgewotICAgICAgICAgICAgJ2RhdGEnOiBkYXRh Lm9wdGlvbnMKLSAgICAgICAgICB9KTsKLSAgICAgICAgdGhpcy4kZWwuZmlu ZCgic2VsZWN0Iikuc2VsZWN0MihvcHRzKS52YWwoZGF0YS5yYXdWYWx1ZSku dHJpZ2dlcigiY2hhbmdlIik7CisgICAgICAgICAge30sIHRoaXMuZGVmYXVs dHMuc2VsZWN0MiwgZGF0YS5zZWxlY3QyKTsKICAgICAgICAgdGhpcy51cGRh dGVJbnZhbGlkKCk7CiAgICAgICAgIH0KICAgICAgIH0KQEAgLTM3MCw3ICsz NjAsNyBAQCBmdW5jdGlvbigkLCBfLCBTLCBwZ0FkbWluLCBwZ0Jyb3dzZXIs IGFsZXJ0aWZ5KSB7CiAKICAgICAgIC8vIFJlbW92ZSBDb2x1bW5zIGlmIGlu aGVyaXQgb3B0aW9uIGlzIGRlc2VsZWN0ZWQgZnJvbSB0aGUgY29tYm9ib3gK ICAgICAgIGlmKF8uc2l6ZSh2YWx1ZSkgPCBfLnNpemUoaW5oZXJpdHMpKSB7 Ci0gICAgICAgIHZhciBkaWYgPSAgXy5kaWZmZXJlbmNlKGluaGVyaXRzLCBK U09OLnBhcnNlKHZhbHVlKSk7CisgICAgICAgIHZhciBkaWYgPSAgXy5kaWZm ZXJlbmNlKGluaGVyaXRzLCB2YWx1ZSk7CiAgICAgICAgIHZhciBybXZfY29s dW1ucyA9IGNvbHVtbnMud2hlcmUoe2luaGVyaXRlZGlkOiBwYXJzZUludChk aWZbMF0pfSk7CiAgICAgICAgIGNvbHVtbnMucmVtb3ZlKHJtdl9jb2x1bW5z KTsKICAgICAgIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVp Z25fdGFibGVzL3RlbXBsYXRlcy9mb3JlaWduX3RhYmxlcy9zcWwvOS41X3Bs dXMvZ2V0X3RhYmxlcy5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3Rh Ymxlcy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvc3FsLzkuNV9wbHVzL2dl dF90YWJsZXMuc3FsCmluZGV4IDgzNDQ1YTIuLjFiYjUwMWUgMTAwNjQ0Ci0t LSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9m b3JlaWduX3RhYmxlcy9zcWwvOS41X3BsdXMvZ2V0X3RhYmxlcy5zcWwKKysr IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2Zv cmVpZ25fdGFibGVzL3NxbC85LjVfcGx1cy9nZXRfdGFibGVzLnNxbApAQCAt OSw3ICs5LDcgQEAgV0hFUkUKIAogeyUgZWxzZSAlfQogU0VMRUNUCi0gICAg Yy5vaWQgQVMgaWQsIHF1b3RlX2lkZW50KG4ubnNwbmFtZSkgfHwgJy4nIHx8 IHF1b3RlX2lkZW50KGMucmVsbmFtZSkgYXMgdGV4dAorICAgIGMub2lkIEFT IHZhbHVlLCBxdW90ZV9pZGVudChuLm5zcG5hbWUpIHx8ICcuJyB8fCBxdW90 ZV9pZGVudChjLnJlbG5hbWUpIGFzIGxhYmVsCiBGUk9NCiAgICAgcGdfY2xh c3MgYywgcGdfbmFtZXNwYWNlIG4KIFdIRVJFCkBAIC0xOSw0ICsxOSw0IEBA IFdIRVJFCiB7JSBlbmRpZiAlfQogT1JERVIgQlkKICAgICBuLm5zcG5hbWUs IGMucmVsbmFtZTsKLXslIGVuZGlmICV9Cit7JSBlbmRpZiAlfQpcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpzIGIvd2ViL3BnYWRtaW4v c3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKaW5kZXggOTczYjYwYi4u ZmI2YzUxZiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jh Y2tmb3JtLnBnYWRtaW4uanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pz L2JhY2tmb3JtLnBnYWRtaW4uanMKQEAgLTE3OTMsNyArMTc5MywxMSBAQAog ICAgICAgaWYgKF8uaXNBcnJheShmb3JtYXR0ZWREYXRhKSkgewogICAgICAg ICByZXR1cm4gXy5tYXAoZm9ybWF0dGVkRGF0YSwgZGVjb2RlVVJJQ29tcG9u ZW50KTsKICAgICAgIH0gZWxzZSB7Ci0gICAgICAgIHJldHVybiBkZWNvZGVV UklDb21wb25lbnQoZm9ybWF0dGVkRGF0YSk7CisgICAgICAgIGlmKCFfLmlz TnVsbChmb3JtYXR0ZWREYXRhKSAmJiAhXy5pc1VuZGVmaW5lZChmb3JtYXR0 ZWREYXRhKSkgeworICAgICAgICAgIHJldHVybiBkZWNvZGVVUklDb21wb25l bnQoZm9ybWF0dGVkRGF0YSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgcmV0dXJuIG51bGw7CisgICAgICAgIH0KICAgICAgIH0KICAgICB9CiAg IH0pOwpAQCAtMTkwNCw5ICsxOTA4LDE1IEBACiAgICAgICByZXR1cm4gdGhp czsKICAgICB9LAogICAgIGdldFZhbHVlRnJvbURPTTogZnVuY3Rpb24oKSB7 Ci0gICAgICByZXR1cm4gQmFja2Zvcm0uU2VsZWN0Q29udHJvbC5wcm90b3R5 cGUuZ2V0VmFsdWVGcm9tRE9NLmFwcGx5KAotICAgICAgICB0aGlzLCBhcmd1 bWVudHMKLSAgICAgICk7CisgICAgICB2YXIgdmFsID0gQmFja2Zvcm0uU2Vs ZWN0Q29udHJvbC5wcm90b3R5cGUuZ2V0VmFsdWVGcm9tRE9NLmFwcGx5KAor ICAgICAgICAgICAgICAgICAgdGhpcywgYXJndW1lbnRzCisgICAgICAgICAg ICAgICAgKSwKKyAgICAgICAgc2VsZWN0Mk9wdHMgPSBfLmV4dGVuZCh7fSwg dGhpcy5maWVsZC5nZXQoInNlbGVjdDIiKSB8fCB0aGlzLmRlZmF1bHRzLnNl bGVjdDIpOworCisgICAgICBpZiAoc2VsZWN0Mk9wdHMubXVsdGlwbGUgJiYg dmFsID09IG51bGwpIHsKKyAgICAgICAgcmV0dXJuIFtdOworICAgICAgfQor ICAgICAgcmV0dXJuIHZhbDsKICAgICB9CiAgIH0pOwogCg== --001a113cfd8a74331c0536f65077 Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --001a113cfd8a74331c0536f65077--