From e6a264760e5ada5b47774cefe0c4c137f40f34b1 Mon Sep 17 00:00:00 2001
From: Kálmán Viktor <kviktor@cloud.bme.hu>
Date: Wed, 25 Jun 2014 12:58:05 +0200
Subject: [PATCH] dashboard: don't be merge activites with different user
---
circle/dashboard/views.py | 2 +-
circle/vm/models/instance.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py
index dde36c5..9fa0982 100644
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
@@ -2092,7 +2092,7 @@ class LeaseDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
@require_GET
def vm_activity(request, pk):
instance = Instance.objects.get(pk=pk)
- if not instance.has_level(request.user, 'owner'):
+ if not instance.has_level(request.user, 'user'):
raise PermissionDenied()
response = {}
diff --git a/circle/vm/models/instance.py b/circle/vm/models/instance.py
index fae51a3..5236024 100644
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
@@ -937,6 +937,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
if (latest == a.activity_code and
merged_acts[-1].result == a.result and
a.finished and merged_acts[-1].finished and
+ a.user == merged_acts[-1].user and
(merged_acts[-1].finished - a.finished).days < 7 and
not a.activity_code.endswith(whitelist)):
merged_acts[-1].times += 1
--
libgit2 0.26.0