r4020 bugfix: clear VLAN config on object reset

commitResetObject: now deletes rows from PortNativeVLAN and PortAllowedVLAN tables

diff --git a/ChangeLog b/ChangeLog
index 3754120e2e0a93bb76ea586bcb8e769f6dafcdca..8e253ba6a5bca337e3d890e0de3b86b76f30c9dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
        update: upon deleting 802.1Q order record focus SELECTs on the deleted values
        bugfix: SQL error issue on some versions of PHP introduced in 0.18.5
        new feature: 802.1Q: ability to recalculate the switch uplinks and downlinks by pressing a button on 8021q ports page
+       bugfix: when clearing object, allowed VLANs are also cleared now
 0.18.5 2010-10-25
        bugfix: attribute map editor was broken (#353)
        bugfix: speed up IPv4 VLAN selector (by Boris Lytochkin)

diff --git a/inc/database.php b/inc/database.php
index 76d42c5b2c87fa6a050f6170f8052f80cf0c5a80..4743aa82dca82a7877e9f548ce566c91ad5c1019 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -682,6 +682,8 @@ function commitResetObject ($object_id = 0)
        usePreparedExecuteBlade ('DELETE FROM RackSpace WHERE object_id = ?', array ($object_id));
        // 802.1Q
        usePreparedDeleteBlade ('PortVLANMode', array ('object_id' => $object_id));
+       usePreparedDeleteBlade ('PortNativeVLAN', array ('object_id' => $object_id));
+       usePreparedDeleteBlade ('PortAllowedVLAN', array ('object_id' => $object_id));
        usePreparedDeleteBlade ('CachedPVM', array ('object_id' => $object_id));
        usePreparedDeleteBlade ('VLANSwitch', array ('object_id' => $object_id));
        // Ports & links