Reformatting & cleanup

This commit is contained in:
R. Miles McCain
2020-04-24 16:29:23 -04:00
parent 3a63f6f850
commit 62844db6bf
10 changed files with 55 additions and 45 deletions

View File

@@ -1,8 +1,8 @@
from allauth.account.admin import EmailAddress
from django import forms
from django.utils.translation import gettext_lazy as _
from core.models import Service, User
from allauth.account.admin import EmailAddress
class ServiceForm(forms.ModelForm):
@@ -27,7 +27,10 @@ class ServiceForm(forms.ModelForm):
"respect_dnt": "Should visitors who have enabled <a href='https://en.wikipedia.org/wiki/Do_Not_Track'>Do Not Track</a> be excluded from all data?",
}
collaborators = forms.CharField(help_text="Which users should have read-only access to this service? (Comma separated list of emails.)", required=False)
collaborators = forms.CharField(
help_text="Which users should have read-only access to this service? (Comma separated list of emails.)",
required=False,
)
def clean_collaborators(self):
collaborators = []
@@ -35,7 +38,9 @@ class ServiceForm(forms.ModelForm):
email = collaborator_email.strip()
if email == "":
continue
collaborator_email_linked = EmailAddress.objects.filter(email__iexact=email).first()
collaborator_email_linked = EmailAddress.objects.filter(
email__iexact=email
).first()
if collaborator_email_linked is None:
raise forms.ValidationError(f"Email '{email}' is not registered")
collaborators.append(collaborator_email_linked.user)

View File

@@ -1,6 +1,6 @@
from datetime import datetime, time
from urllib.parse import urlparse
from datetime import time, datetime
from django.utils import timezone

View File

@@ -1,6 +1,7 @@
from urllib.parse import urlparse
import pycountry
import flag
import pycountry
from django import template
from django.utils import timezone
from django.utils.html import escape
@@ -41,17 +42,12 @@ def country_name(isocode):
@register.simple_tag
def relative_stat_tone(
start,
end,
good="UP",
good_classes=None,
bad_classes=None,
neutral_classes=None,
start, end, good="UP", good_classes=None, bad_classes=None, neutral_classes=None,
):
good_classes = good_classes or "~positive"
bad_classes = bad_classes or "~critical"
neutral_classes = neutral_classes or "~neutral"
if start == None or end == None or start == end:
return neutral_classes
if good == "UP":

View File

@@ -1,5 +1,6 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.core.cache import cache
from django.db.models import Q
from django.shortcuts import get_object_or_404, reverse
from django.utils import timezone
@@ -12,7 +13,6 @@ from django.views.generic import (
UpdateView,
)
from rules.contrib.views import PermissionRequiredMixin
from django.core.cache import cache
from analytics.models import Session
from core.models import Service