From 2d7eaa63c44e0f34d46a36a9029169964f36ae37 Mon Sep 17 00:00:00 2001
From: Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>
Date: Thu, 24 Jan 2019 16:39:55 +0000
Subject: [PATCH] Fix alignment of help messages in properties panels. Fixes
 #3929

---
 docs/en_US/release_notes_4_2.rst          | 3 ++-
 web/pgadmin/static/js/backform.pgadmin.js | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/en_US/release_notes_4_2.rst b/docs/en_US/release_notes_4_2.rst
index d6a145ae3..14f728c09 100644
--- a/docs/en_US/release_notes_4_2.rst
+++ b/docs/en_US/release_notes_4_2.rst
@@ -37,4 +37,5 @@ Bug fixes
 | `Bug #3872 <https://redmine.postgresql.org/issues/3872>`_ - Ensure object names in external process dialogues are properly escaped.
 | `Bug #3891 <https://redmine.postgresql.org/issues/3891>`_ - Correct order of Save and Cancel button for json/jsonb editing.
 | `Bug #3897 <https://redmine.postgresql.org/issues/3897>`_ - Data should be updated properly for FTS Configurations, FTS Dictionaries, FTS Parsers and FTS Templates.
-| `Bug #3908 <https://redmine.postgresql.org/issues/3908>`_ - Fixed keyboard navigation for Select2 and Privilege cell in Backgrid.
\ No newline at end of file
+| `Bug #3908 <https://redmine.postgresql.org/issues/3908>`_ - Fixed keyboard navigation for Select2 and Privilege cell in Backgrid.
+| `Bug #3929 <https://redmine.postgresql.org/issues/3929>`_ - Fix alignment of help messages in properties panels.
\ No newline at end of file
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index a4ed36be6..369243dcf 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -163,10 +163,10 @@ define([
       '  <span class="<%=Backform.controlClassName%> uneditable-input" <%=disabled ? "disabled readonly" : ""%>>',
       '    <%-value%>',
       '  </span>',
+      '  <% if (helpMessage && helpMessage.length) { %>',
+      '    <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
+      '  <% } %>',
       '</div>',
-      '<% if (helpMessage && helpMessage.length) { %>',
-      '  <span class="<%=Backform.helpMessageClassName%>"><%=helpMessage%></span>',
-      '<% } %>',
     ].join('\n')),
 
     clearInvalid: function() {