Fixed a bug that was not loading correctly the Actions.

koalalorenzo · Aug 14, 2014 · 8879ade · 8879ade
1 parent 80004a2
commit 8879ade
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/digitalocean/Action.py b/digitalocean/Action.py
@@ -11,11 +11,18 @@ def __init__(self, *args, **kwargs):
         self.resource_id = None
         self.resource_type = None
         self.region = None
+        # Custom, not provided by the json object.
+        self.droplet_id = None
 
         super(Action, self).__init__(*args, **kwargs)
 
     def load(self):
-        action = self.get_data("actions/%s" % self.id)
+        action = self.get_data(
+            "droplets/%s/actions/%s" % (
+                self.droplet_id,
+                self.id
+            )
+        )
         if action:
             action = action[u'action']
             # Loading attributes

diff --git a/digitalocean/Droplet.py b/digitalocean/Droplet.py
@@ -279,8 +279,10 @@ def get_actions(self):
         """
         actions = []
         for action_id in self.action_ids:
-            action = Action(action_id)
+            action = Action()
+            action.id = action_id
             action.token = self.token
+            action.droplet_id = self.id
             action.load()
             actions.append(action)
         return actions