Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions openwisp_controller/config/base/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,9 @@ def _get_initial_values_for_checked_fields(self):
if not present_values:
return
self.refresh_from_db(fields=present_values.keys())
for field in self._changed_checked_fields:
setattr(self, f"_initial_{field}", field)
setattr(self, field, present_values[field])
for field, value in present_values.items():
setattr(self, f"_initial_{field}", getattr(self, field))
setattr(self, field, value)

def _check_name_changed(self):
if self._initial_name == models.DEFERRED:
Expand Down
14 changes: 14 additions & 0 deletions openwisp_controller/config/tests/test_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,20 @@ def test_device_field_changed_checks(self):
with self.assertNumQueries(3):
device._check_changed_fields()

def test_deferred_fields_populated_correctly(self):
device = self._create_device(
name="deferred-test",
management_ip="10.0.0.1",
)
# Load the instance with deferred fields omitted
device = Device.objects.only("id").get(pk=device.pk)
device.management_ip = "10.0.0.55"
# Saving the device object will populate the deferred fields
device.save()
# Ensure `_initial_<field>` contains the actual value, not the field name
self.assertEqual(getattr(device, "_initial_management_ip"), "10.0.0.55")
self.assertNotEqual(getattr(device, "_initial_management_ip"), "management_ip")

def test_exceed_organization_device_limit(self):
org = self._get_org()
org.config_limits.device_limit = 1
Expand Down
Loading