Skip to content

Gutyán Gábor / circlestack

Go to a project
Commit 1244cb41 by Bach Dániel
Options

vm: Don't stack disk remove activities 

Closes #391
parent e9f8b19f
Showing with 3 additions and 1 deletions
circle/vm/models/instance.py
...@@ -818,7 +818,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin, ...@@ -818,7 +818,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
return acts return acts
def get_merged_activities(self, user=None): 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) acts = self.get_activities(user)
merged_acts = [] merged_acts = []
latest = None latest = None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment