Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add custom query manager to Gym objects
Roland Geiderdf15aecb3dd7
diff --git a/wger/gym/managers.py b/wger/gym/managers.pynew file mode 100644index 000000000..09460f1dc--- /dev/null+++ b/wger/gym/managers.py@@ -0,0 +1,53 @@+# -*- coding: utf-8 -*-++# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++from django.db import models+from django.db.models import Q+from django.contrib.auth.models import (+ Permission,+ User+)+++class GymManager(models.Manager):+ '''+ Custom query manager for Gyms+ '''+ def get_members(self, gym_pk):+ '''+ Returns all members for this gym (i.e non-admin ones)+ '''+ perm_gym = Permission.objects.get(codename='manage_gym')+ perm_gyms = Permission.objects.get(codename='manage_gyms')+ perm_trainer = Permission.objects.get(codename='gym_trainer')++ users = User.objects.filter(userprofile__gym_id=gym_pk)+ return users.exclude(Q(groups__permissions=perm_gym) |+ Q(groups__permissions=perm_gyms) |+ Q(groups__permissions=perm_trainer)).distinct()++ def get_admins(self, gym_pk):+ '''+ Returns all admins for this gym (i.e trainers, managers, etc.)+ '''+ perm_gym = Permission.objects.get(codename='manage_gym')+ perm_gyms = Permission.objects.get(codename='manage_gyms')+ perm_trainer = Permission.objects.get(codename='gym_trainer')++ users = User.objects.filter(userprofile__gym_id=gym_pk)+ return users.filter(Q(groups__permissions=perm_gym) |+ Q(groups__permissions=perm_gyms) |+ Q(groups__permissions=perm_trainer)).distinct()diff --git a/wger/gym/models.py b/wger/gym/models.pyindex a20133aef..7e4e7b7cb 100644--- a/wger/gym/models.py+++ b/wger/gym/models.py@@ -24,6 +24,8 @@ from django.utils.encoding import python_2_unicode_compatiblefrom django.utils.translation import ugettext_lazy as _from django.utils.translation import ugettext+from wger.gym.managers import GymManager+@python_2_unicode_compatibleclass Gym(m.Model):@@ -39,6 +41,11 @@ class Gym(m.Model):)ordering = ["name", ]+ objects = GymManager()+ '''+ Custom Gym Query Manager+ '''+name = m.CharField(max_length=60,verbose_name=_('Name'))'''Gym name'''diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.pyindex 1bebfbf16..0c9bd53e5 100644--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@ -17,11 +17,9 @@ import csvimport datetimeimport logging-from django.db.models import Qfrom django.contrib.auth.decorators import login_requiredfrom django.contrib.auth.models import (Group,- Permission,User)from django.core.urlresolvers import reverse, reverse_lazy@@ -102,22 +100,12 @@ class GymUserListView(WgerPermissionMixin, ListView):out = {'admins': [],'members': []}- perm_gym = Permission.objects.get(codename='manage_gym')- perm_gyms = Permission.objects.get(codename='manage_gyms')- perm_trainer = Permission.objects.get(codename='gym_trainer')- users = User.objects.filter(userprofile__gym_id=self.kwargs['pk'])-- # members list- for u in users.exclude(Q(groups__permissions=perm_gym) |- Q(groups__permissions=perm_gyms) |- Q(groups__permissions=perm_trainer)).distinct():+ for u in Gym.objects.get_members(self.kwargs['pk']):out['members'].append({'obj': u,'last_log': get_user_last_activity(u)})# admins list- for u in users.filter(Q(groups__permissions=perm_gym) |- Q(groups__permissions=perm_gyms) |- Q(groups__permissions=perm_trainer)).distinct():+ for u in Gym.objects.get_admins(self.kwargs['pk']):out['admins'].append({'obj': u,'perms': {'manage_gym': u.has_perm('gym.manage_gym'),'manage_gyms': u.has_perm('gym.manage_gyms'),