IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update Python and JS modules. Fixes #3154

Browse Source
This commit is contained in:
Murtuza Zabuawala
2018-04-04 10:47:01 +01:00
committed by Dave Page
parent fc886cf8bb
commit be055ce57d
88 changed files with 182 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/tools/__init__.py
View File

@@ -11,7 +11,7 @@
from flask import render_template, Response
from flask import url_for
from flask_babel import get_translations, gettext
from flask_babelex import Domain, gettext
from pgadmin.utils import PgAdminModule
from pgadmin.utils.ajax import bad_request
@@ -64,9 +64,11 @@ def translations():
"""Return a js file that will handle translations so Flask interpolation
can be isolated
"""
domain = Domain()
translations = domain.get_translations()
template = render_template(
"js/translations.js",
translations=get_translations()._catalog
translations=translations._catalog
)
return Response(
response=template,

2
web/pgadmin/tools/backup/__init__.py
View File

@@ -15,7 +15,7 @@ import os
from flask import render_template, request, current_app, \
url_for, Response
from flask_babel import gettext as _
from flask_babelex import gettext as _
from flask_security import login_required, current_user
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, get_storage_directory, html, \

2
web/pgadmin/tools/debugger/__init__.py
View File

@@ -16,7 +16,7 @@ import random
from flask import url_for, Response, render_template, request, session, \
current_app
from flask_babel import gettext
from flask_babelex import gettext
from flask_security import login_required
from werkzeug.useragents import UserAgent

2
web/pgadmin/tools/grant_wizard/__init__.py
View File

@@ -12,7 +12,7 @@
import simplejson as json
from flask import Response, url_for
from flask import render_template, request, current_app
from flask_babel import gettext
from flask_babelex import gettext
from flask_security import login_required
from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db
from pgadmin.utils import PgAdminModule

2
web/pgadmin/tools/import_export/__init__.py
View File

@@ -13,7 +13,7 @@ import simplejson as json
import os
from flask import url_for, Response, render_template, request, current_app
from flask_babel import gettext as _
from flask_babelex import gettext as _
from flask_security import login_required, current_user
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, get_storage_directory, html, \

2
web/pgadmin/tools/maintenance/__init__.py
View File

@@ -12,7 +12,7 @@
import simplejson as json
from flask import url_for, Response, render_template, request, current_app
from flask_babel import gettext as _
from flask_babelex import gettext as _
from flask_security import login_required
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, html

2
web/pgadmin/tools/restore/__init__.py
View File

@@ -14,7 +14,7 @@ import os
from flask import render_template, request, current_app, \
url_for, Response
from flask_babel import gettext as _
from flask_babelex import gettext as _
from flask_security import login_required, current_user
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, get_storage_directory, html, \

2
web/pgadmin/tools/sqleditor/__init__.py
View File

@@ -16,7 +16,7 @@ import random
import simplejson as json
from flask import Response, url_for, render_template, session, request, \
current_app
from flask_babel import gettext
from flask_babelex import gettext
from flask_security import login_required
from config import PG_DEFAULT_DRIVER, ON_DEMAND_RECORD_COUNT

2
web/pgadmin/tools/sqleditor/command.py
View File

@@ -16,7 +16,7 @@ except ImportError:
from ordereddict import OrderedDict
import six
from flask import render_template
from flask_babel import gettext
from flask_babelex import gettext
from pgadmin.utils.ajax import forbidden
from pgadmin.utils.driver import get_driver

2
web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
View File

@@ -8,7 +8,7 @@
##########################################################################
"""Register preferences for query tool"""
from flask_babel import gettext
from flask_babelex import gettext
from pgadmin.utils import SHORTCUT_FIELDS as shortcut_fields, \
ACCESSKEY_FIELDS as accesskey_fields
from pgadmin.utils.preferences import Preferences

2
web/pgadmin/tools/sqleditor/utils/start_running_query.py
View File

@@ -13,7 +13,7 @@ import pickle
import random
from flask import Response
from flask_babel import gettext
from flask_babelex import gettext
from config import PG_DEFAULT_DRIVER
from pgadmin.tools.sqleditor.utils.apply_explain_plan_wrapper import \

2
web/pgadmin/tools/user_management/__init__.py
View File

@@ -14,7 +14,7 @@ import re
from flask import render_template, request, \
url_for, Response, abort, current_app
from flask_babel import gettext as _
from flask_babelex import gettext as _
from flask_security import login_required, roles_required, current_user
from flask_security.utils import encrypt_password