vm: Don't stack disk remove activities

Closes #391

vm: Don't stack disk remove activities
Closes #391
1244cb41 · Bach Dániel · e9f8b19f · 1244cb41
Commit 1244cb41 authored Mar 17, 2015 by Bach Dániel
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

circle/vm/models/instance.py
+3 -1

No files found.
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
@@ -818,7 +818,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
        return acts

    def get_merged_activities(self, user=None):
-        whitelist = ("create_disk", "download_disk", "add_port", "remove_port")
+        whitelist = ("create_disk", "download_disk", "remove_disk",
+                     "add_port", "remove_port",
+                     "add_interface", "remove_interface")
        acts = self.get_activities(user)
        merged_acts = []
        latest = None