Amending PR after review

cyverse · May 24, 2017 · 0ddc641 · julianpistorius · Aug 2, 2017 · 0ddc641
1 parent b1eeb51
commit 0ddc641
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/v2/serializers/details/instance.py b/api/v2/serializers/details/instance.py
@@ -60,7 +60,7 @@ def get_size(self, obj):
         return serializer.data
 
     def get_image(self, obj):
-        if not obj.source.is_machine():
+        if obj.source.is_volume():
             return {}
         image_uuid = obj.application_uuid()
         image = Image.objects.get(uuid=image_uuid)
@@ -74,7 +74,7 @@ def get_ip_address(self, obj):
         return obj.ip_address
 
     def get_version(self, obj):
-        if not obj.source.is_machine():
+        if obj.source.is_volume():
             return {}
         version = obj.source.providermachine.application_version
         serializer = ImageVersionSummarySerializer(

diff --git a/core/models/allocation_source.py b/core/models/allocation_source.py
@@ -49,7 +49,7 @@ def time_remaining(self, user=None):
                     "The structure of settings.SPECIAL_ALLOCATION_SOURCES "
                     "has changed! Verify your settings are correct and/or "
                     "change the lines of code above.")
-            last_snapshot = self.user_allocation_snapshots.filter(user__username='test-sgregory').order_by('-updated').last()
+            last_snapshot = self.user_allocation_snapshots.get(user=user)
         else:
             compute_allowed = self.compute_allowed
             last_snapshot = self.snapshot