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

Configuration options for switch control from different places should be merged together and not overridden.

Browse Source
This commit is contained in:
Harshal Dhumal
2016-03-22 14:28:13 +00:00
committed by Dave Page
parent 06c0cf607d
commit 8189b39b1e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,19 +441,21 @@
}, },
events: {'switchChange.bootstrapSwitch': 'onChange'}, events: {'switchChange.bootstrapSwitch': 'onChange'},
render: function() { render: function() {
var field = _.defaults(this.field.toJSON(), this.defaults, {options: $.fn.bootstrapSwitch.defaults}), var field = _.defaults(this.field.toJSON(), this.defaults),
attributes = this.model.toJSON(), attributes = this.model.toJSON(),
attrArr = field.name.split('.'), attrArr = field.name.split('.'),
name = attrArr.shift(), name = attrArr.shift(),
path = attrArr.join('.'), path = attrArr.join('.'),
rawValue = this.keyPathAccessor(attributes[name], path); rawValue = this.keyPathAccessor(attributes[name], path),
options = _.defaults({}, this.field.get('options'), this.defaults.options,
$.fn.bootstrapSwitch.defaults);
Backform.InputControl.prototype.render.apply(this, arguments); Backform.InputControl.prototype.render.apply(this, arguments);
this.$input = this.$el.find("input[type=checkbox]").first(); this.$input = this.$el.find("input[type=checkbox]").first();
//Check & set additional properties //Check & set additional properties
this.$input.bootstrapSwitch( this.$input.bootstrapSwitch(
_.extend(field.options, {'state': rawValue}) _.extend(options, {'state': rawValue})
); );
return this; return this;