Skip to content

Commit 78822e2

Browse files
authored
Compatibility fix for NetBox 3.6.X (#143)
1 parent 2fc1b3b commit 78822e2

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Generated by Django 4.2.5 on 2024-06-07 20:57
2+
13
from django.db import migrations, models
24
import django.db.models.deletion
35

@@ -7,19 +9,19 @@ class Migration(migrations.Migration):
79
initial = True
810

911
dependencies = [
10-
('users', '0010_update_jsonfield'),
12+
('users', '0004_netboxgroup_netboxuser'),
1113
]
1214

1315
operations = [
1416
migrations.CreateModel(
1517
name='SavedTopology',
1618
fields=[
17-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
19+
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
1820
('name', models.CharField(blank=True, max_length=100)),
1921
('topology', models.JSONField()),
2022
('layout_context', models.JSONField(blank=True, null=True)),
2123
('timestamp', models.DateTimeField()),
22-
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.adminuser')),
24+
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.netboxuser')),
2325
],
2426
),
2527
]

nextbox_ui_plugin/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class SavedTopology(models.Model):
88
topology = models.JSONField()
99
layout_context = models.JSONField(null=True, blank=True)
1010
created_by = models.ForeignKey(
11-
to="users.AdminUser",
11+
to="users.NetBoxUser",
1212
on_delete=models.CASCADE,
1313
blank=False,
1414
null=False,

nextbox_ui_plugin/static/nextbox_ui_plugin/next_app.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -451,22 +451,24 @@
451451
var saveResultLabel = document.getElementById('saveResult');
452452
saveButton.setAttribute('disabled', true);
453453
saveResultLabel.setAttribute('innerHTML', 'Processing');
454+
var topoData = {
455+
'name': topoSaveName,
456+
'topology': JSON.stringify(topo.data()),
457+
'layout_context': JSON.stringify({
458+
'initialLayout': initialLayout,
459+
'displayUnconnected': !displayUnconnected,
460+
'undisplayedRoles': undisplayedRoles,
461+
'undisplayedDeviceTags': undisplayedDeviceTags,
462+
'displayPassiveDevices': !displayPassiveDevices,
463+
'displayLogicalMultiCableLinks': displayLogicalMultiCableLinks,
464+
'requestGET': requestGET,
465+
})
466+
}
454467
$.ajax({
455468
type: 'POST',
456469
url: topoSaveURI,
457-
data: {
458-
'name': topoSaveName,
459-
'topology': JSON.stringify(topo.data()),
460-
'layout_context': JSON.stringify({
461-
'initialLayout': initialLayout,
462-
'displayUnconnected': !displayUnconnected,
463-
'undisplayedRoles': undisplayedRoles,
464-
'undisplayedDeviceTags': undisplayedDeviceTags,
465-
'displayPassiveDevices': !displayPassiveDevices,
466-
'displayLogicalMultiCableLinks': displayLogicalMultiCableLinks,
467-
'requestGET': requestGET,
468-
})
469-
},
470+
data: JSON.stringify(topoData),
471+
contentType: "application/json; charset=utf-8",
470472
headers: {'X-CSRFToken': CSRFToken},
471473
success: function (response) {
472474
saveResultLabel.innerHTML = 'Success';

0 commit comments

Comments
 (0)