From caf66684789684b15c0196b9b968500bfccbb540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20Caune?= Date: Fri, 18 Jan 2019 16:44:09 +0200 Subject: [PATCH] Prepare for the removal of Check.user_id and Channel.user_id --- hc/api/models.py | 7 +++---- hc/api/transports.py | 2 +- hc/front/views.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hc/api/models.py b/hc/api/models.py index b604e78a..3b465447 100644 --- a/hc/api/models.py +++ b/hc/api/models.py @@ -170,9 +170,8 @@ class Check(models.Model): return "up" def assign_all_channels(self): - if self.user: - channels = Channel.objects.filter(user=self.user) - self.channel_set.add(*channels) + channels = Channel.objects.filter(project=self.project) + self.channel_set.add(*channels) def tags_list(self): return [t.strip() for t in self.tags.split(" ") if t.strip()] @@ -293,7 +292,7 @@ class Channel(models.Model): } def assign_all_checks(self): - checks = Check.objects.filter(user=self.user) + checks = Check.objects.filter(project=self.project) self.checks.add(*checks) def make_token(self): diff --git a/hc/api/transports.py b/hc/api/transports.py index 29421de6..ce39708c 100644 --- a/hc/api/transports.py +++ b/hc/api/transports.py @@ -374,7 +374,7 @@ class Sms(HttpTransport): return check.status != "down" def notify(self, check): - profile = Profile.objects.for_user(self.channel.user) + profile = Profile.objects.for_user(self.channel.project.owner) if not profile.authorize_sms(): return "Monthly SMS limit exceeded" diff --git a/hc/front/views.py b/hc/front/views.py index 2a4a55ec..d05f3de2 100644 --- a/hc/front/views.py +++ b/hc/front/views.py @@ -148,7 +148,7 @@ def status(request, username): if not _has_access(request, username): raise Http404("not found") - checks = list(Check.objects.filter(user__username=username)) + checks = list(Check.objects.filter(project__owner__username=username)) details = [] for check in checks: