Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Create gym admin configuration

Roland Geider17b848878018
diff --git a/wger/gym/__init__.py b/wger/gym/__init__.py
index e69de29bb..23fd07cad 100644
--- a/wger/gym/__init__.py
+++ b/wger/gym/__init__.py
@@ -0,0 +1,17 @@
+import wger.gym.signals
+
+
+# TODO: django1.7
+# http://stackoverflow.com/questions/2719038/where-should-signal-handlers-liv
+
+# When you upgrade to Django 1.7, you would remove the "import .signals" from
+# your __ init__.py and add an yourapp/apps.py like the following:
+#
+# from django.apps import AppConfig
+#
+# class ReportsConfig(AppConfig):
+# name = 'reports'
+# verbose_name = "Reports"
+#
+# def ready(self):
+# import signals
diff --git a/wger/gym/helpers.py b/wger/gym/helpers.py
index 2b132ecd7..63ed090ba 100644
--- a/wger/gym/helpers.py
+++ b/wger/gym/helpers.py
@@ -44,3 +44,13 @@ def get_user_last_activity(user):
last_activity = last_session
return last_activity
+
+
+def is_any_gym_admin(user):
+ '''
+ Small utility that checks that the user object has any administrator
+ permissions
+ '''
+ return user.has_perm('gym.manage_gym')\
+ or user.has_perm('gym.manage_gyms')\
+ or user.has_perm('gym.gym_trainer')
diff --git a/wger/gym/migrations/0005_auto__del_gymuserconfig__del_unique_gymuserconfig_gym_user__add_gymadm.py b/wger/gym/migrations/0005_auto__del_gymuserconfig__del_unique_gymuserconfig_gym_user__add_gymadm.py
new file mode 100644
index 000000000..74c46f3fa
--- /dev/null
+++ b/wger/gym/migrations/0005_auto__del_gymuserconfig__del_unique_gymuserconfig_gym_user__add_gymadm.py
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Removing unique constraint on 'GymUserConfig', fields ['gym', 'user']
+ db.delete_unique(u'gym_gymuserconfig', ['gym_id', 'user_id'])
+
+ # Deleting model 'GymUserConfig'
+ db.rename_table(u'gym_gymuserconfig', u'gym_gymadminconfig')
+
+ # Adding model 'GymAdminConfig'
+ db.send_create_signal(u'gym', ['GymAdminConfig'])
+
+ # Adding unique constraint on 'GymAdminConfig', fields ['gym', 'user']
+ db.create_unique(u'gym_gymadminconfig', ['gym_id', 'user_id'])
+
+
+ def backwards(self, orm):
+ # Removing unique constraint on 'GymAdminConfig', fields ['gym', 'user']
+ db.delete_unique(u'gym_gymadminconfig', ['gym_id', 'user_id'])
+
+ # Adding model 'GymUserConfig'
+ db.rename_table(u'gym_gymadminconfig', u'gym_gymuserconfig')
+ db.send_create_signal(u'gym', ['GymUserConfig'])
+
+ # Adding unique constraint on 'GymUserConfig', fields ['gym', 'user']
+ db.create_unique(u'gym_gymuserconfig', ['gym_id', 'user_id'])
+
+ # Deleting model 'GymAdminConfig'
+ db.delete_table(u'gym_gymadminconfig')
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ u'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'gym.gym': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Gym'},
+ 'city': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+ 'owner': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'street': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'zip_code': ('django.db.models.fields.IntegerField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'})
+ },
+ u'gym.gymadminconfig': {
+ 'Meta': {'unique_together': "(('gym', 'user'),)", 'object_name': 'GymAdminConfig'},
+ 'gym': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['gym.Gym']", 'unique': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'overview_inactive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
+ },
+ u'gym.gymconfig': {
+ 'Meta': {'object_name': 'GymConfig'},
+ 'gym': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'config'", 'unique': 'True', 'to': u"orm['gym.Gym']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'weeks_inactive': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4', 'max_length': '2'})
+ }
+ }
+
+ complete_apps = ['gym']
diff --git a/wger/gym/models.py b/wger/gym/models.py
index 5e55d0b29..5013c1937 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -132,16 +132,13 @@ class GymConfig(m.Model):
return ugettext(u'Configuration for {}'.format(self.gym.name))
-class GymUserConfig(m.Model):
+class AbstractGymUserConfigModel(m.Model):
'''
- User (actually administrator/trainer) configuration options for a specific gym
+ Abstract class for member and admin gym configuration models
'''
class Meta:
- unique_together = ('gym', 'user')
- '''
- Only one entry per user and gym
- '''
+ abstract = True
gym = m.OneToOneField(Gym,
editable=False)
@@ -155,6 +152,18 @@ class GymUserConfig(m.Model):
User this configuration belongs to
'''
+
+class GymAdminConfig(AbstractGymUserConfigModel, m.Model):
+ '''
+ Administrator/trainer configuration options for a specific gym
+ '''
+
+ class Meta:
+ unique_together = ('gym', 'user')
+ '''
+ Only one entry per user and gym
+ '''
+
overview_inactive = m.BooleanField(verbose_name=_('Receive overview of inactive members'),
default=True)
'''
diff --git a/wger/gym/signals.py b/wger/gym/signals.py
new file mode 100644
index 000000000..c71fce027
--- /dev/null
+++ b/wger/gym/signals.py
@@ -0,0 +1,36 @@
+# -*- 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.conf import settings
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from wger.gym.models import Gym
+from wger.gym.models import GymConfig
+
+
+@receiver(post_save, sender=Gym)
+def gym_config(sender, instance, created, **kwargs):
+ '''
+ Creates a configuration entry for newly added gyms
+ '''
+ if not created or kwargs['raw']:
+ return
+
+ config = GymConfig()
+ config.gym = instance
+ config.save()
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index ac325212d..86e3b2ba4 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -21,6 +21,7 @@ from django.core.urlresolvers import reverse
from wger.core.models import UserProfile
from wger.gym.models import Gym
+from wger.gym.models import GymAdminConfig
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
@@ -36,6 +37,7 @@ class GymAddUserTestCase(WorkoutManagerTestCase):
'''
count_before = User.objects.all().count()
response = self.client.get(reverse('gym:gym:add-user', kwargs={'gym_pk': 1}))
+ self.assertEqual(GymAdminConfig.objects.all().count(), 0)
if fail:
self.assertEqual(response.status_code, 403)
else:
@@ -59,6 +61,7 @@ class GymAddUserTestCase(WorkoutManagerTestCase):
self.assertTrue(self.client.session['gym.user']['password'])
self.assertEqual(len(self.client.session['gym.user']['password']), 15)
new_user = User.objects.get(pk=self.client.session['gym.user']['user_pk'])
+ self.assertEqual(GymAdminConfig.objects.all().count(), 1)
self.assertEqual(new_user.userprofile.gym_id, 1)
def test_add_user_authorized(self):
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 381a72f5e..355e12c47 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -32,8 +32,10 @@ from django.views.generic import CreateView
from django.views.generic import UpdateView
from wger.core.forms import GymUserAddForm
-from wger.gym.helpers import get_user_last_activity
+from wger.gym.helpers import get_user_last_activity, is_any_gym_admin
from wger.gym.models import Gym, GymConfig
+from wger.gym.models import GymAdminConfig
+
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerDeleteMixin
from wger.utils.generic_views import WgerPermissionMixin
@@ -82,9 +84,7 @@ class GymUserListView(WgerPermissionMixin, ListView):
'perms': {'manage_gym': u.has_perm('gym.manage_gym'),
'manage_gyms': u.has_perm('gym.manage_gyms'),
'gym_trainer': u.has_perm('gym.gym_trainer'),
- 'any_admin': u.has_perm('gym.manage_gym')
- or u.has_perm('gym.manage_gyms')
- or u.has_perm('gym.gym_trainer')}})
+ 'any_admin': is_any_gym_admin(u)}})
return out
def get_context_data(self, **kwargs):
@@ -111,16 +111,6 @@ class GymAddView(WgerFormMixin, CreateView):
form_action = reverse_lazy('gym:gym:add')
permission_required = 'gym.add_gym'
- def form_valid(self, form):
- '''
- Create a config object
- '''
- config = GymConfig()
- config.gym = form.save()
- config.save()
-
- return super(GymAddView, self).form_valid(form)
-
@login_required
def gym_new_user_info(request):
@@ -208,10 +198,11 @@ class GymAddUserView(WgerFormMixin, CreateView):
user.last_name = form.cleaned_data['last_name']
form.instance = user
+ # Update profile
user.userprofile.gym = gym
user.userprofile.save()
- # Set appropriate group
+ # Set appropriate permission group
if form.cleaned_data['role'] != 'user':
if form.cleaned_data['role'] == 'trainer':
group = Group.objects.get(name='gym_trainer')
@@ -222,6 +213,16 @@ class GymAddUserView(WgerFormMixin, CreateView):
self.request.session['gym.user'] = {'user_pk': user.pk,
'password': password}
+ # Create config
+ if is_any_gym_admin(user):
+ config = GymAdminConfig()
+ else:
+ pass
+
+ config.user = user
+ config.gym = gym
+ config.save()
+
return super(GymAddUserView, self).form_valid(form)
def get_context_data(self, **kwargs):