NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #1579: Devices already assigned to a cluster cannot be added to a different cluster

Browse Source
This commit is contained in:
Jeremy Stretch 2017-10-17 09:59:35 -04:00
parent 6f2f8697ae
commit 34f1a9ebfb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/templates/virtualization/cluster_add_devices.html
View File

@ -59,6 +59,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var device_list = $('#id_devices'); var device_list = $('#id_devices');
var disabled_indicator = device_list.attr('disabled-indicator');
$('#id_search').autocomplete({ $('#id_search').autocomplete({
source: function(request, response) { source: function(request, response) {
$.ajax({ $.ajax({
@ -70,7 +71,11 @@
}, },
success: function(data) { success: function(data) {
response($.map(data.results, function(item) { response($.map(data.results, function(item) {
device_list.append('<option value="' + item['id'] + '">' + item['display_name'] + '</option>'); var option = $("<option></option>").attr("value", item['id']).text(item['display_name']);
if (disabled_indicator && item[disabled_indicator]) {
option.attr("disabled", "disabled");
}
device_list.append(option);
})); }));
} }
}); });

2
netbox/virtualization/forms.py
View File

@ -210,7 +210,7 @@ class ClusterAddDevicesForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):
# If the Cluster is assigned to a Site, all Devices must be assigned to that Site. # If the Cluster is assigned to a Site, all Devices must be assigned to that Site.
if self.cluster.site is not None: if self.cluster.site is not None:
for device in self.cleaned_data.get('devices'): for device in self.cleaned_data.get('devices', []):
if device.site != self.cluster.site: if device.site != self.cluster.site:
raise ValidationError({ raise ValidationError({
'devices': "{} belongs to a different site ({}) than the cluster ({})".format( 'devices': "{} belongs to a different site ({}) than the cluster ({})".format(