IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-23 23:13:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where <br/> tag is visible in the error message when delete any database and it is in use.

Browse Source
This commit is contained in:
Akshay Joshi 2025-01-17 17:16:36 +05:30
parent 72a3ed9068
commit a410b15e30
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -218,7 +218,7 @@ RUN apk add --no-cache \
chown pgadmin:root /pgadmin4/config_distro.py && \
chmod g=u /pgadmin4/config_distro.py && \
chmod g=u /etc/passwd && \
setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.13 && \
setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.12 && \
echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix

1
docs/en_US/release_notes_9_0.rst
View File

@ -46,3 +46,4 @@ Bug fixes
| `Issue #8299 <https://github.com/pgadmin-org/pgadmin4/issues/8299>`_ - Ensure master password pop up is not shown on setting MASTER_PASSWORD_REQUIRED to false.
| `Issue #8309 <https://github.com/pgadmin-org/pgadmin4/issues/8309>`_ - Remove the option "With no data (concurrently)" from Refresh MATERIALIZED VIEW context menu.
| `Issue #8320 <https://github.com/pgadmin-org/pgadmin4/issues/8320>`_ - Fix an issue where wrong information is shown after using the filter on the Dashboard> State tab.
| `Issue #8365 <https://github.com/pgadmin-org/pgadmin4/issues/8365>`_ - Fixed an issue where PSQL tool is not opening if database name have HTML characters in the name.

3
web/pgadmin/browser/server_groups/servers/databases/__init__.py
View File

@ -34,7 +34,6 @@ from pgadmin.tools.sqleditor.utils.query_history import QueryHistory
from pgadmin.tools.schema_diff.node_registry import SchemaDiffRegistry
from pgadmin.model import db, Server, Database
from pgadmin.browser.utils import underscore_escape
from pgadmin.utils.constants import TWO_PARAM_STRING
@ -1074,7 +1073,7 @@ class DatabaseView(PGChildNodeView):
status, errmsg = conn.connect()
return internal_server_error(
errormsg=underscore_escape(msg))
errormsg=msg)
return make_json_response(success=1)

3
web/pgadmin/utils/driver/psycopg3/connection.py
View File

@ -40,6 +40,7 @@ from pgadmin.utils.master_password import get_crypt_key
from io import StringIO
from pgadmin.utils.locker import ConnectionLocker
from pgadmin.utils.driver import get_driver
from pgadmin.browser.utils import underscore_escape
# On Windows, Psycopg is not compatible with the default ProactorEventLoop.
@ -1688,7 +1689,7 @@ Failed to reset the connection to the server due to following error:
# if formatted_msg is false then return from the function
if not formatted_msg:
notices = self.get_notices()
errmsg = errmsg.replace('\n', '<br/>')
errmsg = underscore_escape(errmsg).replace('\n', '<br/>')
return errmsg if notices == '' else notices + '\n' + errmsg
# Do not append if error starts with `ERROR:` as most pg related