IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-08-13 06:24:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure PG/EPAS configuration warnings are shown appropriate for the server type. Fixes #1563

Browse Source
This commit is contained in:
Murtuza Zabuawala
2016-08-18 17:18:20 +01:00
committed by Dave Page
parent d6391c7e9b
commit 013ff1090e
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/pgadmin/tools/backup/templates/backup/js/backup.js
+4 -2
View File
@@ -387,7 +387,8 @@ TODO LIST FOR BACKUP:
preference_name = 'pg_bin_dir', preference_name = 'pg_bin_dir',
msg = '{{ _('Please configure the PostgreSQL Binary Path in the Preferences dialog.') }}'; msg = '{{ _('Please configure the PostgreSQL Binary Path in the Preferences dialog.') }}';
if (server_data.server_type == 'ppas') { if ((server_data.type && server_data.type == 'ppas') ||
server_data.server_type == 'ppas') {
preference_name = 'ppas_bin_dir'; preference_name = 'ppas_bin_dir';
msg = '{{ _('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.') }}'; msg = '{{ _('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.') }}';
} }
@@ -602,7 +603,8 @@ TODO LIST FOR BACKUP:
preference_name = 'pg_bin_dir', preference_name = 'pg_bin_dir',
msg = '{{ _('Please set binary path for PostgreSQL Server from preferences.') }}'; msg = '{{ _('Please set binary path for PostgreSQL Server from preferences.') }}';
if (server_data.server_type == 'ppas') { if ((server_data.type && server_data.type == 'ppas') ||
server_data.server_type == 'ppas') {
preference_name = 'ppas_bin_dir'; preference_name = 'ppas_bin_dir';
msg = '{{ _('Please set binary path for EDB Advanced Server from preferences.') }}'; msg = '{{ _('Please set binary path for EDB Advanced Server from preferences.') }}';
} }
web/pgadmin/tools/import_export/templates/import_export/js/import_export.js
+2 -1
View File
@@ -324,7 +324,8 @@ define(
preference_name = 'pg_bin_dir', preference_name = 'pg_bin_dir',
msg = '{{ _('Please configure the PostgreSQL Binary Path in the Preferences dialog.') }}'; msg = '{{ _('Please configure the PostgreSQL Binary Path in the Preferences dialog.') }}';
if (server_data.server_type == 'ppas') { if ((server_data.type && server_data.type == 'ppas') ||
server_data.server_type == 'ppas') {
preference_name = 'ppas_bin_dir'; preference_name = 'ppas_bin_dir';
msg = '{{ _('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.') }}'; msg = '{{ _('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.') }}';
} }
web/pgadmin/tools/maintenance/templates/maintenance/js/maintenance.js
+2 -1
View File
@@ -213,7 +213,8 @@ define(
preference_name = 'pg_bin_dir', preference_name = 'pg_bin_dir',
msg = '{{ _('Please configure the PostgreSQL Binary Path in the Preferences dialog.') }}'; msg = '{{ _('Please configure the PostgreSQL Binary Path in the Preferences dialog.') }}';
if (server_data.server_type == 'ppas') { if ((server_data.type && server_data.type == 'ppas') ||
server_data.server_type == 'ppas') {
preference_name = 'ppas_bin_dir'; preference_name = 'ppas_bin_dir';
msg = '{{ _('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.') }}'; msg = '{{ _('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.') }}';
} }
web/pgadmin/tools/restore/templates/restore/js/restore.js
+2 -1
View File
@@ -313,7 +313,8 @@ define([
preference_name = 'pg_bin_dir', preference_name = 'pg_bin_dir',
msg = '{{ _('Please configure the PostgreSQL Binary Path in the Preferences dialog.') }}'; msg = '{{ _('Please configure the PostgreSQL Binary Path in the Preferences dialog.') }}';
if (server_data.server_type == 'ppas') { if ((server_data.type && server_data.type == 'ppas') ||
server_data.server_type == 'ppas') {
preference_name = 'ppas_bin_dir'; preference_name = 'ppas_bin_dir';
msg = '{{ _('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.') }}'; msg = '{{ _('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.') }}';
} }