moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'opennebula-integration' into vm_bill

Browse source
This commit is contained in:
Modulos 2017-05-08 15:46:53 +02:00
commit 3078536bd7
4 changed files with 150 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hosting/views.py
View file

@ -415,8 +415,9 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
ordering = '-id'
def get_queryset(self):
hosting_admin = HostingManageVMAdmin.__new__(HostingManageVMAdmin)
print(hosting_admin.show_vms_view(self.request))
# hosting_admin = HostingManageVMAdmin.__new__(HostingManageVMAdmin)
# print(hosting_admin.show_vms_view(self.request))
print(VirtualMachinePlan.get_vms(self.request.user.email))
user = self.request.user
self.queryset = VirtualMachinePlan.objects.active(user)
return super(VirtualMachinesPlanListView, self).get_queryset()