IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-09 23:15:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changed the Unique Columns of the Variable Control based on the input

Browse Source 
from the user.

i.e.
Set the uniqueCol as ['name', 'role'] in case of hasRole is set to true
in schema for it, ['name', ['database'] in case of hasDatabase is set to
true, otherwise ['name'].

Also - fixed a typo in the callback function headerDataChanged(..).
This commit is contained in:
Harshal Dhumal 2016-01-22 18:18:59 +05:30 committed by Ashesh Vashi
parent d0f7e69ad7
commit c421bef0d0
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
web/pgadmin/browser/server_groups/servers/static/js/variable.js
View File

@ -191,20 +191,28 @@
hasDatabase: false,
hasRole: false,
defaults: _.extend({
uniqueCol: ['name', 'role', 'database']
},
Backform.UniqueColCollectionControl.prototype.defaults
),
initialize: function(opts) {
var self = this;
var self = this,
uniqueCols = ['name'];
/*
* Read from field schema whether user wants to use database and role
* fields in Variable control.
*/
self.hasDatabase = opts.field.get('hasDatabase');
self.hasRole = opts.field.get('hasRole');
// Update unique coll field based on above flag status.
if (self.hasDatabase) {
uniqueCols.push('database')
} else if (self.hasRole) {
uniqueCols.push('role')
}
// Overriding the uniqueCol in the field
if (opts && opts.field) {
if (opts.field instanceof Backform.Field) {
opts.field.set({
uniqueCol: ['name', 'role', 'database'],
uniqueCol: uniqueCols,
model: pgNode.VariableModel
},
{
@ -212,7 +220,7 @@
});
} else {
opts.field.extend({
uniqueCol: ['name', 'role', 'database'],
uniqueCol: uniqueCols,
model: pgNode.VariableModel
});
}
@ -222,8 +230,7 @@
self, arguments
);
self.hasDatabase = self.field.get('hasDatabase');
self.hasRole = self.field.get('hasRole');
self.availVariables = {};
var node = self.field.get('node').type,
@ -566,7 +573,7 @@
checkVars.push('database');
}
if (self.role) {
if (self.hasRole) {
checkVars.push('role');
}