From ec930770407a23e4ca48cc55a42f9591732c5f56 Mon Sep 17 00:00:00 2001
From: Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>
Date: Mon, 6 Feb 2017 12:53:16 +0000
Subject: [PATCH] Compatibility fixes for newer versions of Jinja2 (e.g.
 2.9.5+). Fixes #2156

---
 web/pgadmin/browser/templates/browser/js/browser.js | 6 +++---
 web/pgadmin/templates/base.html                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/pgadmin/browser/templates/browser/js/browser.js b/web/pgadmin/browser/templates/browser/js/browser.js
index 7c720cf8c..170e18eee 100644
--- a/web/pgadmin/browser/templates/browser/js/browser.js
+++ b/web/pgadmin/browser/templates/browser/js/browser.js
@@ -518,8 +518,8 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) {
         // First - register the menus from the other
         // modules/extensions.
         if (counter.total == counter.loaded) {
-{% for key in ('File', 'Edit', 'Object' 'Tools', 'Management', 'Help') %}{% set menu_items = current_app.menu_items['%s_items' % key.lower()] %}{% if menu_items|length > 0 %}{% set hasMenus = False %}
-          obj.add_menus([{% for item in menu_items %}{% if hasMenus %},{% endif %}{
+{% for key in ('File', 'Edit', 'Object' 'Tools', 'Management', 'Help') %}
+          obj.add_menus([{% for item in current_app.menu_items['%s_items' % key.lower()] %}{% if loop.index != 1 %}, {% endif %}{
             name: "{{ item.name }}",
             {% if item.module %}module: {{ item.module }},
             {% endif %}{% if item.url %}url: "{{ item.url }}",
@@ -532,7 +532,7 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) {
             priority: {{ item.priority }},
             enable: '{{ item.enable }}'
           }{% set hasMenus = True %}{% endfor %}]);
-{% endif %}{% endfor %}
+{% endfor %}
           obj.create_menus();
         } else {
           // recall after some time
diff --git a/web/pgadmin/templates/base.html b/web/pgadmin/templates/base.html
index 9a12f34d8..da907d3ec 100755
--- a/web/pgadmin/templates/base.html
+++ b/web/pgadmin/templates/base.html
@@ -152,7 +152,7 @@
                         }
                     }{% for script in current_app.javascripts %}{% if 'deps' in script or 'exports' in script %},
                     '{{ script.name }}': {
-                    {% if 'deps' in script %}"deps": [ {% set comma = False %}{% for dep in script['deps'] %} {% if comma %},{% else %}{% set comma = True %}{% endif %} '{{ dep }}'{% endfor %}],{% endif %}
+                    {% if 'deps' in script %}"deps": [{% for dep in script['deps'] %} {% if loop.index != 1 %}, {% endif %} '{{ dep }}'{% endfor %}],{% endif %}
                         {% if 'exports' in script %}"exports": "{{ script['exports'] }}"{% endif %}
                     }{% endif %}{% endfor %}
                 },