Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dFFTv-00017s-G4 for pgadmin-hackers@arkaria.postgresql.org; Mon, 29 May 2017 07:52:51 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1dFFTu-000427-Pr for pgadmin-hackers@arkaria.postgresql.org; Mon, 29 May 2017 07:52:50 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dFFTg-0003d9-Bu for pgadmin-hackers@postgresql.org; Mon, 29 May 2017 07:52:36 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1dFFTc-0000M6-SV for pgadmin-hackers@postgresql.org; Mon, 29 May 2017 07:52:35 +0000 Received: by mail-wm0-x230.google.com with SMTP id b84so44953775wmh.0 for ; Mon, 29 May 2017 00:52:32 -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=mAgV/hR5F/LDi0SnL8lq2hPmMwp4okpjYz8f1oYS79I=; b=oxyddQLQl+CAeY67F4PVGobCJcAlEmW+Ragd8uKrs2ML64f5XQzn1xhLIo8E1JWoIm mIkEqnT8oBH0bnpI/7m4H0oN9H1qgDaCGoDqAimj7hZxs056CjRUpQEBdIsDT2QeVlUO GAp8Y5MgJZUc8CUacFPn3c4kJJDgbdA87JKmp8AMO5xZsh/dxp3NQ4QlCZvznNzIjtkS UeCHHCc/yabzIRpAUeCBnSIl6m7+RFgA1WNQkbySakLbS2tW03W/CeSJmtrChRs1eJ6X fjVP1+IySYkCg2bh9XGbIrVI1VW+HBqpmCo/h/wVAdKwIt6rPnwylKKaQG1xfQXgbsvt l47A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=mAgV/hR5F/LDi0SnL8lq2hPmMwp4okpjYz8f1oYS79I=; b=jqBiQwRHyMupi8KCqNoy7w97Xf8hGEAT9xbt1hrr6OUxrhGP2PiYxKY6EOcUX/+vRF D/NWsBDqNCNPWhzOxVpCcfK2I+x924YZZLmiD8xHnNZGUZDgo/PZEQ+aRGLg9dGYB8d5 gxN6p20DzkR+6EUVfqaHMQ5aMkMMReWarQMvzyYWyC1mFXqxTifwKgbt5kpRlEgzxMz3 vnGRKhtxRQEuOwni06M0Dp+HgofB4qEJwHJCWMYalMicf9jWTHjChXA0WJli50QGYZxZ XnOKoWweOOU1e/qS+JPsKajYuWYaOWphbOqPV/r1nqoxEwOUK3SjmQ0FuhN8A1fc7lXd zLWg== X-Gm-Message-State: AODbwcBtpNgVtThQceHt8ytpS/CMKwGmxqPHM2dLVBBB2IVaW9ZQkpQQ KV/pZhKKlWOB7nxY0WD4ymSvINGD2JFMCuI= X-Received: by 10.223.155.2 with SMTP id b2mr9354487wrc.87.1496044351714; Mon, 29 May 2017 00:52:31 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.19.138 with HTTP; Mon, 29 May 2017 00:52:00 -0700 (PDT) From: Surinder Kumar Date: Mon, 29 May 2017 13:22:00 +0530 Message-ID: Subject: [pgAdmin4][RM_2424]: Menu Items don't appear in tools menu for modules that are loaded using deps To: pgadmin-hackers Content-Type: multipart/mixed; boundary="94eb2c1cd484278e9d0550a4f891" 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 --94eb2c1cd484278e9d0550a4f891 Content-Type: multipart/alternative; boundary="94eb2c1cd484278e990550a4f88f" --94eb2c1cd484278e990550a4f88f Content-Type: text/plain; charset="UTF-8" Hi *Issue:* If modules are loaded without any node dependency(i.e: on page load), the function 'create_menu' is called implicitly to generate menu items. But when the modules are loaded when its dependent node expands, the function 'create_menus' has to explicitly call after 'add_menus' from respective module's template files. This patch is dependent on patch 'load_modules_js_when_required.patch' Please find attached patch and review. --94eb2c1cd484278e990550a4f88f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi<= /div>

Issue:

<= /div>
If modules are = loaded without any node dependency(i.e: on page load), the function 'cr= eate_menu' is called implicitly to generate menu items.

But when the modules are loaded when its= dependent node expands, the function 'create_menus' has to explici= tly call after 'add_menus' from respective module's template fi= les.

=
This patch is depend= ent on patch 'load_modules_js_when_required.patch'

Please find attached patch and revie= w.
--94eb2c1cd484278e990550a4f88f-- --94eb2c1cd484278e9d0550a4f891 Content-Type: application/octet-stream; name="RM_2424.patch" Content-Disposition: attachment; filename="RM_2424.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j39ttvt00 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL3JvbGVzL3RlbXBsYXRlcy9yb2xlL2pzL3JvbGUuanMgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9yb2xl cy90ZW1wbGF0ZXMvcm9sZS9qcy9yb2xlLmpzCmluZGV4IGE4NTQxNmMuLjgx ODBhNjAgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL3JvbGVzL3RlbXBsYXRlcy9yb2xlL2pzL3JvbGUu anMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvcm9sZXMvdGVtcGxhdGVzL3JvbGUvanMvcm9sZS5qcwpAQCAtMzc1 LDYgKzM3NSw3IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRtaW4sIHBnQnJv d3NlciwgYWxlcnRpZnksIEJhY2tmb3JtKSB7CiAgICAgICAgICAgaWNvbjog J3djVGFiSWNvbiBpY29uLXJvbGUnLCBkYXRhOiB7YWN0aW9uOiAnY3JlYXRl J30sCiAgICAgICAgICAgZW5hYmxlOiAnY2FuX2NyZWF0ZV9yb2xlJwogICAg ICAgICB9XSk7CisgICAgICAgIHBnQnJvd3Nlci5jcmVhdGVfbWVudXMoKTsK ICAgICAgIH0sCiAgICAgICBjYW5fY3JlYXRlX3JvbGU6IGZ1bmN0aW9uKG5v ZGUsIGl0ZW0pIHsKICAgICAgICAgdmFyIHRyZWVEYXRhID0gdGhpcy5nZXRU cmVlTm9kZUhpZXJhcmNoeShpdGVtKSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL3Rvb2xzL2JhY2t1cC90ZW1wbGF0ZXMvYmFja3VwL2pzL2JhY2t1cC5q cyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC90ZW1wbGF0ZXMvYmFja3Vw L2pzL2JhY2t1cC5qcwppbmRleCA0Yzc0MmY5Li4wYjA1MmUzIDEwMDY0NAot LS0gYS93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvdGVtcGxhdGVzL2JhY2t1 cC9qcy9iYWNrdXAuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvYmFja3Vw L3RlbXBsYXRlcy9iYWNrdXAvanMvYmFja3VwLmpzCkBAIC0zNTIsNiArMzUy LDcgQEAgVE9ETyBMSVNUIEZPUiBCQUNLVVA6CiAgICAgICAgIH0KIAogICAg ICAgICBwZ0FkbWluLkJyb3dzZXIuYWRkX21lbnVzKG1lbnVzKTsKKyAgICAg ICAgcGdBZG1pbi5Ccm93c2VyLmNyZWF0ZV9tZW51cygpOwogICAgICAgICBy ZXR1cm4gdGhpczsKICAgICAgIH0sCiAgICAgICBzdGFydF9iYWNrdXBfZ2xv YmFsOiBmdW5jdGlvbihhY3Rpb24sIGl0ZW0pIHsKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL3Rvb2xzL2RhdGFncmlkL3RlbXBsYXRlcy9kYXRhZ3JpZC9q cy9kYXRhZ3JpZC5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2RhdGFncmlkL3Rl bXBsYXRlcy9kYXRhZ3JpZC9qcy9kYXRhZ3JpZC5qcwppbmRleCAyYjM1Yjdl Li5hMTExY2ExIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9kYXRh Z3JpZC90ZW1wbGF0ZXMvZGF0YWdyaWQvanMvZGF0YWdyaWQuanMKKysrIGIv d2ViL3BnYWRtaW4vdG9vbHMvZGF0YWdyaWQvdGVtcGxhdGVzL2RhdGFncmlk L2pzL2RhdGFncmlkLmpzCkBAIC0xMDYsNiArMTA2LDcgQEAgZGVmaW5lKAog CiAgICAgICAgIHBnQWRtaW4uQnJvd3Nlci5hZGRfbWVudV9jYXRlZ29yeSgn dmlld19kYXRhJywgJ3t7IF8oJ1ZpZXcgRGF0YScpIH19JywgMTAwLCAnZmEg ZmEtdGgnKTsKICAgICAgICAgcGdBZG1pbi5Ccm93c2VyLmFkZF9tZW51cyht ZW51cyk7CisgICAgICAgIHBnQWRtaW4uQnJvd3Nlci5jcmVhdGVfbWVudXMo KTsKIAogICAgICAgICAvLyBDcmVhdGluZyBhIG5ldyBwZ0FkbWluLkJyb3dz ZXIgZnJhbWUgdG8gc2hvdyB0aGUgZGF0YS4KICAgICAgICAgdmFyIGRhdGFH cmlkRnJhbWVUeXBlID0gbmV3IHBnQWRtaW4uQnJvd3Nlci5GcmFtZSh7CmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9ncmFudF93aXphcmQvdGVt cGxhdGVzL2dyYW50X3dpemFyZC9qcy9ncmFudF93aXphcmQuanMgYi93ZWIv cGdhZG1pbi90b29scy9ncmFudF93aXphcmQvdGVtcGxhdGVzL2dyYW50X3dp emFyZC9qcy9ncmFudF93aXphcmQuanMKaW5kZXggZGI2Y2ZkMC4uYjcyYjRk YiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvZ3JhbnRfd2l6YXJk L3RlbXBsYXRlcy9ncmFudF93aXphcmQvanMvZ3JhbnRfd2l6YXJkLmpzCisr KyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2dyYW50X3dpemFyZC90ZW1wbGF0ZXMv Z3JhbnRfd2l6YXJkL2pzL2dyYW50X3dpemFyZC5qcwpAQCAtMTkxLDcgKzE5 MSw3IEBAIGRlZmluZShbCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQog ICAgICAgICBwZ0FkbWluLkJyb3dzZXIuYWRkX21lbnVzKG1lbnVzKTsKLQor ICAgICAgICBwZ0FkbWluLkJyb3dzZXIuY3JlYXRlX21lbnVzKCk7CiAgICAg ICAgIHJldHVybiB0aGlzOwogICAgICAgfSwKIApkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vdG9vbHMvaW1wb3J0X2V4cG9ydC90ZW1wbGF0ZXMvaW1wb3J0 X2V4cG9ydC9qcy9pbXBvcnRfZXhwb3J0LmpzIGIvd2ViL3BnYWRtaW4vdG9v bHMvaW1wb3J0X2V4cG9ydC90ZW1wbGF0ZXMvaW1wb3J0X2V4cG9ydC9qcy9p bXBvcnRfZXhwb3J0LmpzCmluZGV4IGEzMDA1MzEuLmMyOWI5ZjEgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2ltcG9ydF9leHBvcnQvdGVtcGxh dGVzL2ltcG9ydF9leHBvcnQvanMvaW1wb3J0X2V4cG9ydC5qcworKysgYi93 ZWIvcGdhZG1pbi90b29scy9pbXBvcnRfZXhwb3J0L3RlbXBsYXRlcy9pbXBv cnRfZXhwb3J0L2pzL2ltcG9ydF9leHBvcnQuanMKQEAgLTI5Miw2ICsyOTIs NyBAQCBkZWZpbmUoCiAgICAgICAgICAgY2F0ZWdvcnk6ICdpbXBvcnQnLCBw cmlvcml0eTogMTAsIGxhYmVsOiAne3sgXygnSW1wb3J0L0V4cG9ydC4uLicp IH19JywKICAgICAgICAgICBpY29uOiAnZmEgZmEtc2hvcHBpbmctY2FydCcs IGVuYWJsZTogbWVudV9lbmFibGVkCiAgICAgICAgIH1dKTsKKyAgICAgICAg cGdCcm93c2VyLmNyZWF0ZV9tZW51cygpOwogICAgICAgfSwKIAogICAgICAg LyoKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNl L3RlbXBsYXRlcy9tYWludGVuYW5jZS9qcy9tYWludGVuYW5jZS5qcyBiL3dl Yi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL3RlbXBsYXRlcy9tYWludGVu YW5jZS9qcy9tYWludGVuYW5jZS5qcwppbmRleCAzZDJiNTFhLi4yMjkzMWY4 IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9tYWludGVuYW5jZS90 ZW1wbGF0ZXMvbWFpbnRlbmFuY2UvanMvbWFpbnRlbmFuY2UuanMKKysrIGIv d2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvdGVtcGxhdGVzL21haW50 ZW5hbmNlL2pzL21haW50ZW5hbmNlLmpzCkBAIC0xODksNiArMTg5LDcgQEAg ZGVmaW5lKAogICAgICAgICAgIH0pOwogICAgICAgICB9CiAgICAgICAgIHBn QnJvd3Nlci5hZGRfbWVudXMobWVudXMpOworICAgICAgICBwZ0Jyb3dzZXIu Y3JlYXRlX21lbnVzKCk7CiAgICAgICB9LAogCiAgICAgICAvKgpkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvcmVzdG9yZS90ZW1wbGF0ZXMvcmVz dG9yZS9qcy9yZXN0b3JlLmpzIGIvd2ViL3BnYWRtaW4vdG9vbHMvcmVzdG9y ZS90ZW1wbGF0ZXMvcmVzdG9yZS9qcy9yZXN0b3JlLmpzCmluZGV4IGUxN2Q5 Y2UuLjVkMmE4ZTggMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3Jl c3RvcmUvdGVtcGxhdGVzL3Jlc3RvcmUvanMvcmVzdG9yZS5qcworKysgYi93 ZWIvcGdhZG1pbi90b29scy9yZXN0b3JlL3RlbXBsYXRlcy9yZXN0b3JlL2pz L3Jlc3RvcmUuanMKQEAgLTI5MCw2ICsyOTAsNyBAQCBkZWZpbmUoWwogICAg ICAgICB9CiAKICAgICAgICAgcGdBZG1pbi5Ccm93c2VyLmFkZF9tZW51cyht ZW51cyk7CisgICAgICAgIHBnQWRtaW4uQnJvd3Nlci5jcmVhdGVfbWVudXMo KTsKICAgICAgICAgcmV0dXJuIHRoaXM7CiAgICAgICB9LAogICAgICAgLy8g Q2FsbGJhY2sgdG8gZHJhdyBCYWNrdXAgRGlhbG9nIGZvciBvYmplY3RzCg== --94eb2c1cd484278e9d0550a4f891 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 --94eb2c1cd484278e9d0550a4f891--