Merge remote-tracking branch 'dansheps/inline-vlan-editing' into inline-vlan-editing

# Conflicts:
#	netbox/project-static/js/forms.js
This commit is contained in:
Daniel Sheppard 2019-09-06 11:45:24 -05:00
commit 6fc69d5ba6

View File

@ -196,6 +196,7 @@ $(document).ready(function() {
processResults: function (data) {
var element = this.$element[0];
$(element).children('option').attr('disabled', false);
var results = data.results;
results = results.reduce((results,record) => {