pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where the inherited table name with quotes did not escape correctly. Fixes #4985.

pull/27/head
Akshay Joshi 2019-12-03 19:31:32 +05:30
parent 9110703aaa
commit f7cc79fab1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_16.rst
View File

@ -47,3 +47,4 @@ Bug fixes
| `Issue #4965 <https://redmine.postgresql.org/issues/4965>`_ - Fix an issue where the Interval data type is not displayed in the properties dialog of table/column. | `Issue #4965 <https://redmine.postgresql.org/issues/4965>`_ - Fix an issue where the Interval data type is not displayed in the properties dialog of table/column.
| `Issue #4966 <https://redmine.postgresql.org/issues/4966>`_ - Fix 'Could not find the object on the server.' error while refreshing the check constraint. | `Issue #4966 <https://redmine.postgresql.org/issues/4966>`_ - Fix 'Could not find the object on the server.' error while refreshing the check constraint.
| `Issue #4978 <https://redmine.postgresql.org/issues/4978>`_ - Fix pgAdmin4 failed to start issue after upgrading to version 4.15. | `Issue #4978 <https://redmine.postgresql.org/issues/4978>`_ - Fix pgAdmin4 failed to start issue after upgrading to version 4.15.
| `Issue #4985 <https://redmine.postgresql.org/issues/4985>`_ - Fix an issue where the inherited table name with quotes did not escape correctly.

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

@ -2069,10 +2069,11 @@ define([
fromRaw: function(rawData) { fromRaw: function(rawData) {
return encodeURIComponent(rawData); return encodeURIComponent(rawData);
}, },
toRaw: function(formattedData) { toRaw: function(formattedData, model, opts) {
if (_.isArray(formattedData)) { if (_.isArray(formattedData)) {
let tmpArr = _.map(formattedData, encodeURIComponent); if (opts && opts.tags)
return _.map(tmpArr, decodeURIComponent); return formattedData;
return _.map(formattedData, decodeURIComponent);
} else { } else {
if (!_.isNull(formattedData) && !_.isUndefined(formattedData)) { if (!_.isNull(formattedData) && !_.isUndefined(formattedData)) {
return decodeURIComponent(formattedData); return decodeURIComponent(formattedData);
@ -2279,10 +2280,8 @@ define([
return this; return this;
}, },
getValueFromDOM: function() { getValueFromDOM: function() {
var val = Backform.SelectControl.prototype.getValueFromDOM.apply( var select2Opts = _.extend({}, this.field.get('select2') || this.defaults.select2),
this, arguments val = this.formatter.toRaw(this.$sel.val(), this.model, select2Opts);
),
select2Opts = _.extend({}, this.field.get('select2') || this.defaults.select2);
if (select2Opts.multiple && val == null) { if (select2Opts.multiple && val == null) {
return []; return [];