From a28df1e0a2f9940935ae972ec23810a198e257da Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Thu, 24 Mar 2016 12:53:11 +0530 Subject: [PATCH] Allow to show help string in each of the contorl. --- web/pgadmin/static/js/backform.pgadmin.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js index 9e0753edd..60a93ac1a 100644 --- a/web/pgadmin/static/js/backform.pgadmin.js +++ b/web/pgadmin/static/js/backform.pgadmin.js @@ -110,6 +110,8 @@ // and rerender the View element _.extend(Backform.Control.prototype, { + defaults: _.extend(Backform.Control.prototype.defaults, {helpMessage: null}), + initialize: function() { BackformControlInit.apply(this, arguments); @@ -161,7 +163,10 @@ ' >', ' <%=value%>', ' ', - '' + '', + '<% if (helpMessage && helpMessage.length) { %>', + ' <%=helpMessage%>', + '<% } %>', ].join("\n")), clearInvalid: function() { @@ -270,7 +275,7 @@ _.extend( Backform.TextareaControl.prototype, { defaults: _.extend( - Backform.TextareaControl.prototype.defaults, {rows: 5} + Backform.TextareaControl.prototype.defaults, {rows: 5, helpMessage: null} ), events : { "change textarea": "onChange", @@ -353,6 +358,7 @@ return this; }; + _.extend(Backform.SelectControl.prototype.defaults, {helpMessage: null}); var ReadonlyOptionControl = Backform.ReadonlyOptionControl = Backform.SelectControl.extend({ template: _.template([ @@ -364,6 +370,9 @@ ' <%-option.label%>', ' <% } %>', '<% } %>', + '<% if (helpMessage && helpMessage.length) { %>', + ' <%=helpMessage%>', + '<% } %>', '' ].join("\n")), events: {}, @@ -421,7 +430,8 @@ offColor: 'primary', size: 'small' }, - extraClasses: [] + extraClasses: [], + helpMessage: null }, template: _.template([ '', @@ -431,7 +441,10 @@ ' <%=disabled ? "disabled" : ""%> <%=required ? "required" : ""%> />', ' ', ' ', - '' + '', + '<% if (helpMessage && helpMessage.length) { %>', + ' <%=helpMessage%>', + '<% } %>' ].join("\n")), getValueFromDOM: function() { return this.formatter.toRaw(