From 41aea907fe80e351b9bcd7638b0157bc9444511e Mon Sep 17 00:00:00 2001
From: Kálmán Viktor <kviktor@cloud.bme.hu>
Date: Mon, 10 Feb 2014 11:05:19 +0100
Subject: [PATCH] dashboard: fix vm search
---
circle/dashboard/views.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py
index d45dab5..cc61a3a 100644
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
@@ -96,7 +96,8 @@ class IndexView(LoginRequiredMixin, TemplateView):
})
running = [i for i in instances if i.state == 'RUNNING']
- stopped = [i for i in instances if i.state not in ['RUNNING', 'NOSTATE']]
+ stopped = [i for i in instances if i.state not in ['RUNNING',
+ 'NOSTATE']]
context.update({
'running_vms': running,
'running_vm_num': len(running),
@@ -666,9 +667,12 @@ class VmList(LoginRequiredMixin, SingleTableView):
favourite__user=self.request.user).values_list('pk', flat=True)
instances = Instance.get_objects_with_level(
'user', self.request.user).filter(
- destroyed=None).values('pk', 'name', 'state')
- for i in instances:
- i['fav'] = True if i['pk'] in favs else False
+ destroyed=None).all()
+ instances = [{
+ 'pk': i.pk,
+ 'name': i.name,
+ 'state': i.state,
+ 'fav': i.pk in favs} for i in instances]
return HttpResponse(
json.dumps(list(instances)), # instances is ValuesQuerySet
content_type="application/json",
--
libgit2 0.26.0