From 6ac646b4f780ecc2c34426afb1497b31b9929d40 Mon Sep 17 00:00:00 2001 From: Samuel Gaist <samuel.gaist@idiap.ch> Date: Fri, 20 Dec 2019 10:12:20 +0100 Subject: [PATCH] [team][models] pre-commit cleanup --- beat/web/team/models.py | 64 +++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/beat/web/team/models.py b/beat/web/team/models.py index 5814b7870..0c06c7343 100644 --- a/beat/web/team/models.py +++ b/beat/web/team/models.py @@ -33,7 +33,6 @@ from django.utils.translation import ugettext_lazy as _ class TeamManager(models.Manager): - def get_by_natural_key(self, owner_username, name): return self.get(owner__username=owner_username, name=name) @@ -42,13 +41,14 @@ class TeamManager(models.Manager): if user.is_anonymous(): return self.public() - query = Q(owner=user) |\ - (Q(privacy_level__in=[Team.MEMBERS, Team.PRIVATE]) & Q(members=user)) + query = Q(owner=user) | ( + Q(privacy_level__in=[Team.MEMBERS, Team.PRIVATE]) & Q(members=user) + ) if add_public: query |= Q(privacy_level=Team.PUBLIC) - return self.filter(query).distinct().order_by('privacy_level') + return self.filter(query).distinct().order_by("privacy_level") def public(self): return self.filter(privacy_level=Team.PUBLIC) @@ -56,49 +56,45 @@ class TeamManager(models.Manager): class Team(models.Model): - #_____ Constants __________ + # _____ Constants __________ PRIVATE = 0 MEMBERS = 1 - PUBLIC = 2 - + PUBLIC = 2 - #_____ Fields __________ + # _____ Fields __________ PRIVACY_LEVELS = [ - [PRIVATE, _('Private')], - [MEMBERS, _('Members only')], - [PUBLIC, _('Public')], + [PRIVATE, _("Private")], + [MEMBERS, _("Members only")], + [PUBLIC, _("Public")], ] - owner = models.ForeignKey(User) - name = models.CharField(max_length=32) - short_description = models.TextField(max_length=100, default='', blank=True) - members = models.ManyToManyField(User, related_name='teams', blank=True) - privacy_level = models.PositiveIntegerField(default=PRIVATE, choices=PRIVACY_LEVELS) + owner = models.ForeignKey(User) + name = models.CharField(max_length=32) + short_description = models.TextField(max_length=100, default="", blank=True) + members = models.ManyToManyField(User, related_name="teams", blank=True) + privacy_level = models.PositiveIntegerField(default=PRIVATE, choices=PRIVACY_LEVELS) objects = TeamManager() - - #_____ Meta parameters __________ + # _____ Meta parameters __________ class Meta: - unique_together = ['owner', 'name'] + unique_together = ["owner", "name"] - - #_____ Utilities __________ + # _____ Utilities __________ def natural_key(self): return (self.owner.username, self.name) - def total_shares(self, user=None): - '''Count number of objects shared with this team + """Count number of objects shared with this team If ``user`` is passed, counts objects shared with this team that the given user has access to. - ''' + """ used_at = 0 @@ -127,34 +123,34 @@ class Team(models.Model): used_at += self.shared_environments.for_user(user, add_public=True).count() used_at += self.shared_experiments.for_user(user, add_public=True).count() used_at += self.shared_librarys.for_user(user, add_public=True).count() - used_at += self.shared_plotterparameters.for_user(user, add_public=True).count() + used_at += self.shared_plotterparameters.for_user( + user, add_public=True + ).count() used_at += self.shared_plotters.for_user(user, add_public=True).count() used_at += self.shared_searchs.for_user(user, add_public=True).count() used_at += self.shared_toolchains.for_user(user, add_public=True).count() used_at += self.usable_algorithms.for_user(user, add_public=True).count() used_at += self.usable_librarys.for_user(user, add_public=True).count() - used_at += self.usable_plotterparameters.for_user(user, add_public=True).count() + used_at += self.usable_plotterparameters.for_user( + user, add_public=True + ).count() used_at += self.usable_plotters.for_user(user, add_public=True).count() return used_at - def deletable(self): return not self.total_shares() - - #_____ Overrides __________ + # _____ Overrides __________ def __unicode__(self): return self.fullname() - - #_____ Methods __________ + # _____ Methods __________ def fullname(self): - return '%s/%s' % (self.owner.username, self.name) - + return "%s/%s" % (self.owner.username, self.name) def get_absolute_url(self): - return reverse('teams:view', args=(self.owner.username, self.name)) + return reverse("teams:view", args=(self.owner.username, self.name)) -- GitLab