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

Fixed an issue where server names with special characters are not displayed correctly in the process tab. Fixes #7695

Browse Source
This commit is contained in:
Aditya Toshniwal
2022-09-15 16:43:37 +05:30
committed by Akshay Joshi
parent 769f58970e
commit 04b1e26041
9 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,9 +115,6 @@ class BackupMessage(IProcessDesc):
host = manager.local_bind_host if manager.use_ssh_tunnel else s.host
port = manager.local_bind_port if manager.use_ssh_tunnel else s.port
s.name = html.safe_str(s.name)
host = html.safe_str(host)
port = html.safe_str(port)
return "{0} ({1}:{2})".format(s.name, host, port)
@property
@@ -140,9 +137,7 @@ class BackupMessage(IProcessDesc):
return _(
"Backing up an object on the server '{0}' "
"from database '{1}'"
).format(server_name,
html.safe_str(self.database)
)
).format(server_name, self.database)
if self.backup_type == BACKUP.GLOBALS:
return _("Backing up the global objects on "
"the server '{0}'").format(

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

@@ -98,7 +98,7 @@ class IEMessage(IProcessDesc):
if s is None:
return _("Not available")
return html.safe_str("{0} ({1}:{2})".format(s.name, s.host, s.port))
return "{0} ({1}:{2})".format(s.name, s.host, s.port)
@property
def message(self):
@@ -107,9 +107,7 @@ class IEMessage(IProcessDesc):
"Copying table data '{0}.{1}' on database '{2}' "
"and server '{3}'"
).format(
html.safe_str(self.schema),
html.safe_str(self.table),
html.safe_str(self.database),
self.schema, self.table, self.database,
self.get_server_name()
)

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

@@ -73,9 +73,6 @@ class Message(IProcessDesc):
host = manager.local_bind_host if manager.use_ssh_tunnel else s.host
port = manager.local_bind_port if manager.use_ssh_tunnel else s.port
s.name = html.safe_str(s.name)
host = html.safe_str(host)
port = html.safe_str(port)
return "{0} ({1}:{2})".format(s.name, host, port)
def get_op(self):

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

@@ -89,9 +89,6 @@ class RestoreMessage(IProcessDesc):
host = manager.local_bind_host if manager.use_ssh_tunnel else s.host
port = manager.local_bind_port if manager.use_ssh_tunnel else s.port
s.name = html.safe_str(s.name)
host = html.safe_str(host)
port = html.safe_str(port)
return "{0} ({1}:{2})".format(s.name, host, port)
@property