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

Fix sub-node error display.

Browse Source
This commit is contained in:
Murtuza Zabuawala 2016-04-07 11:51:16 +01:00 committed by Dave Page
parent 1ba0814377
commit 3914f5095a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/static/css/overrides.css
View File

@ -660,6 +660,10 @@ table.backgrid tr.new {
margin-right: 0px; margin-right: 0px;
} }
.subnode-error .help-block {
color: #a94442;
}
.select2-container--default .select2-search--inline .select2-search__field { .select2-container--default .select2-search--inline .select2-search__field {
background: transparent none repeat scroll 0% 0%; background: transparent none repeat scroll 0% 0%;
border: medium none; border: medium none;

14
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -1094,6 +1094,11 @@
return $dialog; return $dialog;
}, },
clearInvalid: function() {
this.$el.removeClass("subnode-error");
this.$el.find(".pgadmin-control-error-message").remove();
return this;
},
updateInvalid: function() { updateInvalid: function() {
var self = this, var self = this,
errorModel = this.model.errorModel; errorModel = this.model.errorModel;
@ -1107,7 +1112,7 @@
if (_.isEmpty(error)) return; if (_.isEmpty(error)) return;
self.$el.addClass(Backform.errorClassName).append( self.$el.addClass("subnode-error").append(
$("<div></div>").addClass('pgadmin-control-error-message col-xs-offset-4 col-xs-8 help-block').text(error) $("<div></div>").addClass('pgadmin-control-error-message col-xs-offset-4 col-xs-8 help-block').text(error)
); );
}); });
@ -1163,10 +1168,15 @@
if (_.isEmpty(error)) return; if (_.isEmpty(error)) return;
self.$el.addClass(Backform.errorClassName).append( self.$el.addClass('subnode-error').append(
$("<div></div>").addClass('pgadmin-control-error-message col-xs-offset-4 col-xs-8 help-block').text(error) $("<div></div>").addClass('pgadmin-control-error-message col-xs-offset-4 col-xs-8 help-block').text(error)
); );
}, },
clearInvalid: function() {
this.$el.removeClass('subnode-error');
this.$el.find(".pgadmin-control-error-message").remove();
return this;
},
showGridControl: function(data) { showGridControl: function(data) {
var gridHeader = ["<div class='subnode-header'>", var gridHeader = ["<div class='subnode-header'>",
" <label class='control-label col-sm-4'>" + data.label + "</label>" , " <label class='control-label col-sm-4'>" + data.label + "</label>" ,