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

Ensure that username should be visible in the 'Connect to Server' popup when service and user name both specified. Fixes #5871

Browse Source
This commit is contained in:
Rahul Shirsat 2021-01-29 11:32:27 +05:30 committed by Akshay Joshi
parent e230787f21
commit ab642344d4
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes.rst
View File

@ -11,6 +11,7 @@ notes for it.
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
release_notes_5_0
release_notes_4_30 release_notes_4_30
release_notes_4_29 release_notes_4_29
release_notes_4_28 release_notes_4_28

20
docs/en_US/release_notes_5_0.rst Normal file
View File

@ -0,0 +1,20 @@
************
Version 5.0
************
Release date: 2021-02-25
This release contains a number of bug fixes and new features since the release of pgAdmin4 4.30.
New features
************
Housekeeping
************
Bug fixes
*********
| `Issue #5871 <https://redmine.postgresql.org/issues/5871>`_ - Ensure that username should be visible in the 'Connect to Server' popup when service and user name both specified.

6
web/pgadmin/browser/server_groups/servers/templates/servers/password.html
View File

@ -1,11 +1,11 @@
<form name="frmPassword" id="frmPassword" style="height: 100%; width: 100%" onsubmit="return false;"> <form name="frmPassword" id="frmPassword" style="height: 100%; width: 100%" onsubmit="return false;">
<div> <div>
<div><span class="font-weight-bold" > <div><span class="font-weight-bold" >
{% if service %} {% if username %}
{{ _('Please enter the password for the user to connect the server - "{0}"').format(server_label) }}
{% else %}
{{ _('Please enter the password for the user \'{0}\' to connect the server - "{1}"').format(username, {{ _('Please enter the password for the user \'{0}\' to connect the server - "{1}"').format(username,
server_label) }} server_label) }}
{% else %}
{{ _('Please enter the password for the user to connect the server - "{0}"').format(server_label) }}
{% endif %} {% endif %}
</span></div> </span></div>
<div class="input-group row py-2"> <div class="input-group row py-2">