Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move gym views and models to own app

Roland Geider9df3a89f07c3
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.py
index e92c9eb12..2ff11a119 100644
--- a/extras/scripts/filter-fixtures.py
+++ b/extras/scripts/filter-fixtures.py
@@ -54,6 +54,11 @@ filter_dump(data, ('exercises.exerciseimage',), 'exercise-images.json')
filter_dump(data, ('exercises.exercise', 'exercises.exercisecomment',), 'exercises.json')
filter_dump(data, ('exercises.equipment', 'exercises.equipment',), 'equipment.json')
+#
+# Gym
+#
+filter_dump(data, ('gym.gym',), 'gyms.json')
+
#
# Core
#
diff --git a/wger/config/models.py b/wger/config/models.py
index d6139d8bb..b727c6d18 100644
--- a/wger/config/models.py
+++ b/wger/config/models.py
@@ -22,8 +22,8 @@ from django.db.models.signals import post_save
from django.utils.translation import ugettext_lazy as _
from django.core.cache import cache
from wger.core.models import Language
-from wger.core.models import Gym
from wger.core.models import UserProfile
+from wger.gym.models import Gym
from wger.utils.cache import delete_template_fragment_cache
from wger.utils.cache import cache_mapper
@@ -128,6 +128,7 @@ class GymConfig(models.Model):
System wide configuration for gyms
At the moment this only allows to set one gym as the default
+ TODO: close registration (users can only become members thorough an admin)
'''
default_gym = models.ForeignKey(Gym,
@@ -146,7 +147,7 @@ class GymConfig(models.Model):
'''
Return a more human-readable representation
'''
- return u"Default gym {0}".format(self.gym)
+ return u"Default gym {0}".format(self.default_gym)
def save(self, *args, **kwargs):
'''
diff --git a/wger/config/tests/test_gym_config.py b/wger/config/tests/test_gym_config.py
index faf888691..3b5cf2891 100644
--- a/wger/config/tests/test_gym_config.py
+++ b/wger/config/tests/test_gym_config.py
@@ -19,7 +19,8 @@ from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from wger.config.models import GymConfig
-from wger.core.models import Gym, UserProfile
+from wger.core.models import UserProfile
+from wger.gym.models import Gym
from wger.manager.tests.testcase import WorkoutManagerTestCase
diff --git a/wger/core/fixtures/groups.json b/wger/core/fixtures/groups.json
index 9205af37f..4ecd46176 100644
--- a/wger/core/fixtures/groups.json
+++ b/wger/core/fixtures/groups.json
@@ -35,21 +35,6 @@
"config",
"languageconfig"
],
- [
- "add_gym",
- "core",
- "gym"
- ],
- [
- "change_gym",
- "core",
- "gym"
- ],
- [
- "delete_gym",
- "core",
- "gym"
- ],
[
"add_language",
"core",
@@ -169,6 +154,36 @@
"delete_muscle",
"exercises",
"muscle"
+ ],
+ [
+ "add_gym",
+ "gym",
+ "gym"
+ ],
+ [
+ "change_gym",
+ "gym",
+ "gym"
+ ],
+ [
+ "delete_gym",
+ "gym",
+ "gym"
+ ],
+ [
+ "manage_gyms",
+ "gym",
+ "gym"
+ ],
+ [
+ "manage_gym",
+ "gym",
+ "gym"
+ ],
+ [
+ "gym_trainer",
+ "gym",
+ "gym"
]
]
}
@@ -196,22 +211,22 @@
],
[
"add_gym",
- "core",
+ "gym",
"gym"
],
[
"change_gym",
- "core",
+ "gym",
"gym"
],
[
"delete_gym",
- "core",
+ "gym",
"gym"
],
[
"manage_gyms",
- "core",
+ "gym",
"gym"
]
]
@@ -225,12 +240,12 @@
"permissions": [
[
"change_gym",
- "core",
+ "gym",
"gym"
],
[
"manage_gym",
- "core",
+ "gym",
"gym"
]
]
@@ -244,7 +259,7 @@
"permissions": [
[
"gym_trainer",
- "core",
+ "gym",
"gym"
]
]
diff --git a/wger/core/migrations/0009_auto__del_gym__chg_field_userprofile_gym.py b/wger/core/migrations/0009_auto__del_gym__chg_field_userprofile_gym.py
new file mode 100644
index 000000000..234a214d8
--- /dev/null
+++ b/wger/core/migrations/0009_auto__del_gym__chg_field_userprofile_gym.py
@@ -0,0 +1,131 @@
+# -*- 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):
+ # Deleting model 'Gym'
+ db.delete_table(u'core_gym')
+
+
+ # Changing field 'UserProfile.gym'
+ db.alter_column(u'core_userprofile', 'gym_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['gym.Gym'], null=True))
+
+ def backwards(self, orm):
+ # Adding model 'Gym'
+ db.create_table(u'core_gym', (
+ ('city', self.gf('django.db.models.fields.CharField')(max_length=30, null=True, blank=True)),
+ ('street', self.gf('django.db.models.fields.CharField')(max_length=30, null=True, blank=True)),
+ ('name', self.gf('django.db.models.fields.CharField')(max_length=60)),
+ ('phone', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True)),
+ ('owner', self.gf('django.db.models.fields.CharField')(max_length=100, null=True, blank=True)),
+ ('zip_code', self.gf('django.db.models.fields.IntegerField')(max_length=5, null=True, blank=True)),
+ ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ))
+ db.send_create_signal(u'core', ['Gym'])
+
+
+ # Changing field 'UserProfile.gym'
+ db.alter_column(u'core_userprofile', 'gym_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.Gym'], null=True))
+
+ 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'core.daysofweek': {
+ 'Meta': {'ordering': "['pk']", 'object_name': 'DaysOfWeek'},
+ 'day_of_week': ('django.db.models.fields.CharField', [], {'max_length': '9'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ u'core.language': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+ },
+ u'core.license': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ u'core.userprofile': {
+ 'Meta': {'object_name': 'UserProfile'},
+ 'age': ('django.db.models.fields.IntegerField', [], {'max_length': '2', 'null': 'True'}),
+ 'calories': ('django.db.models.fields.IntegerField', [], {'default': '2500', 'null': 'True'}),
+ 'freetime_hours': ('django.db.models.fields.IntegerField', [], {'default': '8', 'null': 'True'}),
+ 'freetime_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'gender': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'gym': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['gym.Gym']", 'null': 'True', 'blank': 'True'}),
+ 'height': ('django.db.models.fields.IntegerField', [], {'max_length': '2', 'null': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_workout_notification': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+ 'notification_language': ('django.db.models.fields.related.ForeignKey', [], {'default': '2', 'to': u"orm['core.Language']"}),
+ 'show_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'show_english_ingredients': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'sleep_hours': ('django.db.models.fields.IntegerField', [], {'default': '7', 'null': 'True'}),
+ 'sport_hours': ('django.db.models.fields.IntegerField', [], {'default': '3', 'null': 'True'}),
+ 'sport_intensity': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '1', 'null': 'True'}),
+ 'timer_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'timer_pause': ('django.db.models.fields.IntegerField', [], {'default': '90'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}),
+ 'work_hours': ('django.db.models.fields.IntegerField', [], {'default': '8', 'null': 'True'}),
+ 'work_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'workout_duration': ('django.db.models.fields.IntegerField', [], {'default': '12'}),
+ 'workout_reminder': ('django.db.models.fields.IntegerField', [], {'default': '14'}),
+ 'workout_reminder_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ 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'})
+ }
+ }
+
+ complete_apps = ['core']
\ No newline at end of file
diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.html
index 5e4625524..868b8eb90 100644
--- a/wger/core/templates/mobile/navigation.html
+++ b/wger/core/templates/mobile/navigation.html
@@ -203,7 +203,7 @@
{# #}
{# Adminstration #}
{# #}
- {% if perms.exercises or perms.core.manage_gyms or perms.core.manage_gym or perms.core.gym_trainer %}
+ {% if perms.exercises or perms.gym.manage_gyms or perms.gym.manage_gym or perms.gym.gym_trainer %}
<li class="divider"></li>
<li class="nav-header">{% trans "Administration" %}</li>
{% if perms.core.change_language %}
@@ -212,14 +212,14 @@
{% if perms.core.change_license %}
<li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
{% endif %}
- {% if perms.core.manage_gyms %}
- <li><a href="{% url 'core:gym:list' %}">{% trans "Gyms" %} </a></li>
+ {% if perms.gym.manage_gyms %}
+ <li><a href="{% url 'gym:gym:list' %}">{% trans "Gyms" %} </a></li>
{% endif %}
{# it's not possible to group expressions '(a or b) and c' #}
- {% if perms.core.gym_trainer or perms.core.manage_gym %}
+ {% if perms.gym.gym_trainer or perms.gym.manage_gym %}
{% if user.userprofile.gym %}
- <li><a href="{% url 'core:gym:user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>
+ <li><a href="{% url 'gym:gym:user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>
{% endif %}
{% endif %}
{% endif %}
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 791bb3818..9105ceb4b 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -168,7 +168,7 @@
{# #}
{# Adminstration #}
{# #}
- {% if perms.exercises or perms.core.manage_gyms or perms.core.manage_gym or perms.core.gym_trainer %}
+ {% if perms.exercises or perms.gym.manage_gyms or perms.gym.manage_gym or perms.gym.gym_trainer %}
<li class="divider"></li>
<li class="nav-header">{% trans "Administration" %}</li>
{% if perms.core.change_language %}
@@ -177,14 +177,14 @@
{% if perms.core.change_license %}
<li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
{% endif %}
- {% if perms.core.manage_gyms %}
- <li><a href="{% url 'core:gym:list' %}">{% trans "Gyms" %} </a></li>
+ {% if perms.gym.manage_gyms %}
+ <li><a href="{% url 'gym:gym:list' %}">{% trans "Gyms" %} </a></li>
{% endif %}
{# it's not possible to group expressions '(a or b) and c' #}
- {% if perms.core.gym_trainer or perms.core.manage_gym %}
+ {% if perms.gym.gym_trainer or perms.gym.manage_gym %}
{% if user.userprofile.gym %}
- <li><a href="{% url 'core:gym:user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>
+ <li><a href="{% url 'gym:gym:user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>
{% endif %}
{% endif %}
{% endif %}
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 0c788e022..1cab0d9f6 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -43,7 +43,7 @@
{% endfor %}
</tbody>
</table>
-{% if perms.core.gym_trainer %}
+{% if perms.gym.gym_trainer %}
<a href="{{trainer_login}}" class="btn btn-success btn-sm">{% trans "Log in as this user" %}</a>
<a href="{{trainer_login}}?next={% url 'workout-calendar' %}" class="btn btn-default btn-sm">{% trans "Calendar" %}</a>
<a href="{{trainer_login}}?next={% url 'workout-add' %}" class="btn btn-default btn-sm">{% trans "Add workout" %}</a>
@@ -116,7 +116,7 @@
{% endfor %}
</tbody>
</table>
-{% if perms.core.gym_trainer %}
+{% if perms.gym.gym_trainer %}
<a href="{{trainer_login}}?next={% url 'weight-overview' %}" class="btn btn-default btn-sm">{% trans "Weight overview" %}</a>
{% endif %}
@@ -162,7 +162,7 @@
{% block sidebar %}
-{% if perms.core.manage_gym %}
+{% if perms.gym.manage_gym %}
<div class="btn-group pull-right">
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
@@ -217,7 +217,7 @@
<td>{% trans "Last login" %}</td>
<td>{{current_user.last_login}}</td>
</tr>
-{% if perms.core.manage_gym %}
+{% if perms.gym.manage_gym %}
<tr {% if not current_user.is_active %}class="danger"{% endif%}>
<td>{% trans "Status" %}</td>
<td>
@@ -231,7 +231,7 @@
{% endif %}
</table>
-<a href="{% url 'core:gym:user-list' current_user.userprofile.gym.pk %}" {% auto_link_css flavour %}>
+<a href="{% url 'gym:gym:user-list' current_user.userprofile.gym.pk %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/list.svg' %}"
width="32"
height="32"
diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.py
index 4a99fbd35..da752b4bb 100644
--- a/wger/core/tests/test_user.py
+++ b/wger/core/tests/test_user.py
@@ -20,7 +20,7 @@ from django.contrib.contenttypes.models import ContentType
from django.core.urlresolvers import reverse
from wger.core.models import UserProfile
-from wger.core.models import Gym
+from wger.gym.models import Gym
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
@@ -107,198 +107,6 @@ class StatusUserTestCase(WorkoutManagerTestCase):
self.deactivate(fail=True)
-class GymAddUserTestCase(WorkoutManagerTestCase):
- '''
- Tests admin adding users to gyms
- '''
-
- def add_user(self, fail=False):
- '''
- Helper function to add users
- '''
- count_before = User.objects.all().count()
- response = self.client.get(reverse('core:gym:add-user', kwargs={'gym_pk': 1}))
- if fail:
- self.assertEqual(response.status_code, 403)
- else:
- self.assertEqual(response.status_code, 200)
-
- response = self.client.post(reverse('core:gym:add-user', kwargs={'gym_pk': 1}),
- {'first_name': 'Cletus',
- 'last_name': 'Spuckle',
- 'username': 'cletus',
- 'email': '[email protected]',
- 'role': 'admin'})
- count_after = User.objects.all().count()
- if fail:
- self.assertEqual(response.status_code, 403)
- self.assertEqual(count_before, count_after)
- self.assertFalse(self.client.session.get('gym.user'))
- else:
- self.assertEqual(count_before + 1, count_after)
- self.assertEqual(response.status_code, 302)
- self.assertTrue(self.client.session['gym.user']['user_pk'], 3)
- 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(new_user.userprofile.gym_id, 1)
-
- def test_add_user_authorized(self):
- '''
- Tests adding a user as an administrator
- '''
- self.user_login('admin')
- self.add_user()
-
- def test_add_user_unauthorized(self):
- '''
- Tests adding a user a different user
- '''
- self.user_login('test')
- self.add_user(fail=True)
-
- def test_add_user_logged_out(self):
- '''
- Tests adding a user a logged out user
- '''
- self.add_user(fail=True)
-
- def new_user_data_export(self, fail=False):
- '''
- Helper function to test exporting the data of a newly created user
- '''
- response = self.client.get(reverse('core:gym:new-user-data-export'))
- if fail:
- self.assertIn(response.status_code, (302, 403))
- else:
- self.assertEqual(response.status_code, 200)
- self.assertEqual(response['Content-Type'], 'text/csv')
- today = datetime.date.today()
- filename = 'User-data-{t.year}-{t.month:02d}-{t.day:02d}-cletus.csv'.format(t=today)
- self.assertEqual(response['Content-Disposition'],
- 'attachment; filename={}'.format(filename))
- self.assertGreaterEqual(len(response.content), 90)
- self.assertLessEqual(len(response.content), 120)
-
- def test_new_user_data_export(self):
- '''
- Test exporting the data of a newly created user
- '''
- self.user_login('admin')
- self.add_user()
- self.new_user_data_export(fail=False)
-
- self.user_logout()
- self.new_user_data_export(fail=True)
-
- self.user_logout()
- self.user_login('test')
- self.new_user_data_export(fail=True)
-
-
-class TrainerLoginTestCase(WorkoutManagerTestCase):
- '''
- Tests the trainer login view (switching to user ID)
- '''
-
- def test_anonymous(self):
- '''
- Test the trainer login as an anonymous user
- '''
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
- self.assertEqual(response.status_code, 302)
- self.assertFalse(self.client.session.get('trainer.identity'))
-
- def test_user(self):
- '''
- Test the trainer login as a logged in user without rights
- '''
- self.user_login('test')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
- self.assertEqual(response.status_code, 403)
- self.assertFalse(self.client.session.get('trainer.identity'))
-
- def test_trainer(self):
- '''
- Test the trainer login as a logged in user with enough rights
- '''
- self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
- self.assertEqual(response.status_code, 302)
- self.assertTrue(self.client.session.get('trainer.identity'))
-
- def test_wrong_gym(self):
- '''
- Test changing the identity to a user in a different gym
- '''
- profile = UserProfile.objects.get(user_id=2)
- profile.gym_id = 2
- profile.save()
- self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
- self.assertEqual(response.status_code, 403)
- self.assertFalse(self.client.session.get('trainer.identity'))
-
- def test_gym_trainer(self):
- '''
- Test changing the identity to a user with trainer rights
- '''
- user = User.objects.get(pk=2)
- content_type = ContentType.objects.get_for_model(Gym)
- permission = Permission.objects.get(content_type=content_type, codename='gym_trainer')
- user.user_permissions.add(permission)
-
- self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
- self.assertEqual(response.status_code, 403)
- self.assertFalse(self.client.session.get('trainer.identity'))
-
- def test_gym_manager(self):
- '''
- Test changing the identity to a user with gym management rights
- '''
- user = User.objects.get(pk=2)
- content_type = ContentType.objects.get_for_model(Gym)
- permission = Permission.objects.get(content_type=content_type, codename='manage_gym')
- user.user_permissions.add(permission)
-
- self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
- self.assertEqual(response.status_code, 403)
- self.assertFalse(self.client.session.get('trainer.identity'))
-
- def test_gyms_manager(self):
- '''
- Test changing the identity to a user with gyms management rights
- '''
- user = User.objects.get(pk=2)
- content_type = ContentType.objects.get_for_model(Gym)
- permission = Permission.objects.get(content_type=content_type, codename='manage_gyms')
- user.user_permissions.add(permission)
-
- self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
- self.assertEqual(response.status_code, 403)
- self.assertFalse(self.client.session.get('trainer.identity'))
-
-
-class TrainerLogoutTestCase(WorkoutManagerTestCase):
- '''
- Tests the trainer logout view (switching back to trainer ID)
- '''
-
- def test_logout(self):
- '''
- Test the trainer login as an anonymous user
- '''
- self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
- self.assertTrue(self.client.session.get('trainer.identity'))
-
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
- self.assertFalse(self.client.session.get('trainer.identity'))
-
-
class EditUserTestCase(WorkoutManagerEditTestCase):
'''
Tests editing a user by an admin
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 5c402c1d3..a968f3e0f 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -23,35 +23,7 @@ from django.core.urlresolvers import reverse_lazy
from wger.core.views import user
from wger.core.views import misc
from wger.core.views import license
-from wger.core.views import gym
-
-# Gyms
-patterns_gym = patterns('',
- url(r'^list$',
- gym.GymListView.as_view(),
- name='list'),
- url(r'^new-user-data/view$',
- gym.gym_new_user_info,
- name='new-user-data'),
- url(r'^new-user-data/export$',
- gym.gym_new_user_info_export,
- name='new-user-data-export'),
- url(r'^(?P<pk>\d+)/members',
- gym.GymUserListView.as_view(),
- name='user-list'),
- url(r'^(?P<gym_pk>\d+)/add-member',
- gym.GymAddUserView.as_view(),
- name='add-user'),
- url(r'^add$',
- gym.GymAddView.as_view(),
- name='add'),
- url(r'^(?P<pk>\d+)/edit',
- gym.GymUpdateView.as_view(),
- name='edit'),
- url(r'^(?P<pk>\d+)/delete',
- gym.GymDeleteView.as_view(),
- name='delete'),
-)
+
urlpatterns = patterns('',
@@ -116,10 +88,6 @@ urlpatterns = patterns('',
url(r'^license/(?P<pk>\d+)/delete',
license.LicenseDeleteView.as_view(),
name='license-delete'),
-
- url(r'^gym/', include(patterns_gym, namespace="gym")),
-
-
# Others
url(r'^about$',
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 18937492c..5769a7d83 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -83,11 +83,11 @@ def delete(request, user_pk=None):
# Forbidden if the user has not enough rights, doesn't belong to the
# gym or is an admin as well
- if (not request.user.has_perm('core.manage_gym')
+ if (not request.user.has_perm('gym.manage_gym')
or request.user.userprofile.gym_id != user.userprofile.gym_id
- or user.has_perm('core.manage_gym')
- or user.has_perm('core.gym_trainer')
- or user.has_perm('core.manage_gyms')):
+ or user.has_perm('gym.manage_gym')
+ or user.has_perm('gym.gym_trainer')
+ or user.has_perm('gym.manage_gyms')):
return HttpResponseForbidden()
else:
user = request.user
@@ -108,7 +108,7 @@ def delete(request, user_pk=None):
return HttpResponseRedirect(reverse('software:features'))
else:
gym_pk = request.user.userprofile.gym_id
- return HttpResponseRedirect(reverse('core:gym:user-list', kwargs={'pk': gym_pk}))
+ return HttpResponseRedirect(reverse('gym:gym:user-list', kwargs={'pk': gym_pk}))
context = {'form': form,
'user_delete': user,
'form_action': form_action}
@@ -129,22 +129,22 @@ def trainer_login(request, user_pk):
return HttpResponseForbidden()
# No changing if identity is not set
- if not request.user.has_perm('core.gym_trainer') \
+ if not request.user.has_perm('gym.gym_trainer') \
and not request.session.get('trainer.identity'):
return HttpResponseForbidden()
# Changing between trainers or managers is not allowed
- if request.user.has_perm('core.gym_trainer') \
- and (user.has_perm('core.gym_trainer')
- or user.has_perm('core.manage_gym')
- or user.has_perm('core.manage_gyms')):
+ if request.user.has_perm('gym.gym_trainer') \
+ and (user.has_perm('gym.gym_trainer')
+ or user.has_perm('gym.manage_gym')
+ or user.has_perm('gym.manage_gyms')):
return HttpResponseForbidden()
# Check if we're switching back to our original account
own = False
- if (user.has_perm('core.gym_trainer')
- or user.has_perm('core.manage_gym')
- or user.has_perm('core.manage_gyms')):
+ if (user.has_perm('gym.gym_trainer')
+ or user.has_perm('gym.manage_gym')
+ or user.has_perm('gym.manage_gyms')):
own = True
# Note: it seems we have to manually set the authentication backend here
@@ -162,7 +162,7 @@ def trainer_login(request, user_pk):
else:
return HttpResponseRedirect(reverse('core:index'))
else:
- return HttpResponseRedirect(reverse('core:gym:user-list',
+ return HttpResponseRedirect(reverse('gym:gym:user-list',
kwargs={'pk': user.userprofile.gym_id}))
@@ -282,14 +282,14 @@ class UserDeactivateView(WgerPermissionMixin, RedirectView):
'''
permanent = False
model = User
- permission_required = ('core.manage_gym', 'core.gym_trainer')
+ permission_required = ('gym.manage_gym', 'gym.gym_trainer')
def dispatch(self, request, *args, **kwargs):
'''
Only managers and trainers for this gym can access the members
'''
edit_user = get_object_or_404(User, pk=self.kwargs['pk'])
- if (request.user.has_perm('core.manage_gym') or request.user.has_perm('core.gym_trainer')
+ if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')
and request.user.userprofile.gym_id == edit_user.userprofile.gym_id):
return super(UserDeactivateView, self).dispatch(request, *args, **kwargs)
return HttpResponseForbidden()
@@ -308,14 +308,14 @@ class UserActivateView(WgerPermissionMixin, RedirectView):
'''
permanent = False
model = User
- permission_required = ('core.manage_gym', 'core.gym_trainer')
+ permission_required = ('gym.manage_gym', 'gym.gym_trainer')
def dispatch(self, request, *args, **kwargs):
'''
Only managers and trainers for this gym can access the members
'''
edit_user = get_object_or_404(User, pk=self.kwargs['pk'])
- if (request.user.has_perm('core.manage_gym') or request.user.has_perm('core.gym_trainer')
+ if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')
and request.user.userprofile.gym_id == edit_user.userprofile.gym_id):
return super(UserActivateView, self).dispatch(request, *args, **kwargs)
return HttpResponseForbidden()
@@ -335,7 +335,7 @@ class UserEditView(WgerFormMixin, UpdateView):
model = User
title = ugettext_lazy('Edit user')
- permission_required = 'core.manage_gym'
+ permission_required = 'gym.manage_gym'
form_class = UserPersonalInformationForm
def dispatch(self, request, *args, **kwargs):
@@ -393,7 +393,7 @@ class UserDetailView(WgerPermissionMixin, DetailView):
Overview of all available gyms
'''
model = User
- permission_required = ('core.manage_gym', 'core.gym_trainer')
+ permission_required = ('gym.manage_gym', 'gym.gym_trainer')
template_name = 'user/overview.html'
context_object_name = 'current_user'
diff --git a/wger/gym/__init__.py b/wger/gym/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wger/core/fixtures/test-gyms.json b/wger/gym/fixtures/test-gyms.json
similarity index 75%
rename from wger/core/fixtures/test-gyms.json
rename to wger/gym/fixtures/test-gyms.json
index 102679d7f..c9a0a5f3a 100644
--- a/wger/core/fixtures/test-gyms.json
+++ b/wger/gym/fixtures/test-gyms.json
@@ -1,21 +1,21 @@
[
{
"pk": 1,
- "model": "core.gym",
+ "model": "gym.gym",
"fields": {
"name": "Test 123"
}
},
{
"pk": 2,
- "model": "core.gym",
+ "model": "gym.gym",
"fields": {
"name": "A cool gym"
}
},
{
"pk": 3,
- "model": "core.gym",
+ "model": "gym.gym",
"fields": {
"name": "Muscle Gym"
}
diff --git a/wger/gym/migrations/0001_initial.py b/wger/gym/migrations/0001_initial.py
new file mode 100644
index 000000000..388e87ed2
--- /dev/null
+++ b/wger/gym/migrations/0001_initial.py
@@ -0,0 +1,48 @@
+# -*- 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):
+
+ depends_on = (
+ ('core', '0008_auto__add_field_gym_phone.py'),
+ )
+
+ def forwards(self, orm):
+ # Adding model 'Gym'
+ db.create_table(u'gym_gym', (
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('name', self.gf('django.db.models.fields.CharField')(max_length=60)),
+ ('phone', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True)),
+ ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
+ ('owner', self.gf('django.db.models.fields.CharField')(max_length=100, null=True, blank=True)),
+ ('zip_code', self.gf('django.db.models.fields.IntegerField')(max_length=5, null=True, blank=True)),
+ ('city', self.gf('django.db.models.fields.CharField')(max_length=30, null=True, blank=True)),
+ ('street', self.gf('django.db.models.fields.CharField')(max_length=30, null=True, blank=True)),
+ ))
+ db.send_create_signal(u'gym', ['Gym'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'Gym'
+ db.delete_table(u'gym_gym')
+
+
+ models = {
+ 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'})
+ }
+ }
+
+ complete_apps = ['gym']
\ No newline at end of file
diff --git a/wger/gym/migrations/0002_copy_gyms.py b/wger/gym/migrations/0002_copy_gyms.py
new file mode 100644
index 000000000..457286551
--- /dev/null
+++ b/wger/gym/migrations/0002_copy_gyms.py
@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+ def forwards(self, orm):
+ "Write your forwards methods here."
+ # Note: Don't use "from appname.models import ModelName".
+ # Use orm.ModelName to refer to models in this application,
+ # and orm['appname.ModelName'] for models in other applications.
+ for gym_core in orm['core.Gym'].objects.all():
+ gym = orm.Gym()
+ gym.id = gym_core.id
+ gym.name = gym_core.name
+ gym.phone = gym_core.phone
+ gym.email = gym_core.email,
+ gym.owner = gym_core.owner,
+ gym.zip_code = gym_core.zip_code
+ gym.city = gym_core.city
+ gym.street = gym_core.street
+ gym.save()
+
+ def backwards(self, orm):
+ "Write your backwards methods here."
+
+ 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'core.daysofweek': {
+ 'Meta': {'ordering': "['pk']", 'object_name': 'DaysOfWeek'},
+ 'day_of_week': ('django.db.models.fields.CharField', [], {'max_length': '9'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ u'core.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'core.language': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+ },
+ u'core.license': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+ },
+ u'core.userprofile': {
+ 'Meta': {'object_name': 'UserProfile'},
+ 'age': ('django.db.models.fields.IntegerField', [], {'max_length': '2', 'null': 'True'}),
+ 'calories': ('django.db.models.fields.IntegerField', [], {'default': '2500', 'null': 'True'}),
+ 'freetime_hours': ('django.db.models.fields.IntegerField', [], {'default': '8', 'null': 'True'}),
+ 'freetime_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'gender': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'gym': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Gym']", 'null': 'True', 'blank': 'True'}),
+ 'height': ('django.db.models.fields.IntegerField', [], {'max_length': '2', 'null': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_workout_notification': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+ 'notification_language': ('django.db.models.fields.related.ForeignKey', [], {'default': '2', 'to': u"orm['core.Language']"}),
+ 'show_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'show_english_ingredients': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'sleep_hours': ('django.db.models.fields.IntegerField', [], {'default': '7', 'null': 'True'}),
+ 'sport_hours': ('django.db.models.fields.IntegerField', [], {'default': '3', 'null': 'True'}),
+ 'sport_intensity': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '1', 'null': 'True'}),
+ 'timer_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'timer_pause': ('django.db.models.fields.IntegerField', [], {'default': '90'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}),
+ 'work_hours': ('django.db.models.fields.IntegerField', [], {'default': '8', 'null': 'True'}),
+ 'work_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),
+ 'workout_duration': ('django.db.models.fields.IntegerField', [], {'default': '12'}),
+ 'workout_reminder': ('django.db.models.fields.IntegerField', [], {'default': '14'}),
+ 'workout_reminder_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ 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'})
+ }
+ }
+
+ complete_apps = ['core', 'gym']
+ symmetrical = True
diff --git a/wger/gym/migrations/__init__.py b/wger/gym/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wger/gym/models.py b/wger/gym/models.py
new file mode 100644
index 000000000..57e8d56c4
--- /dev/null
+++ b/wger/gym/models.py
@@ -0,0 +1,103 @@
+# -*- 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.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext_lazy as _
+
+
+class Gym(models.Model):
+ '''
+ Model for a gym
+ '''
+
+ class Meta:
+ permissions = (
+ ("gym_trainer", _("Trainer, can see the users for a gym")),
+ ("manage_gym", _("Admin, can manage users for a gym")),
+ ("manage_gyms", _("Admin, can administrate the different gyms")),
+ )
+ ordering = ["name", ]
+
+ name = models.CharField(max_length=60,
+ verbose_name=_('Name'))
+ '''Gym name'''
+
+ phone = models.CharField(verbose_name=_('Phone'),
+ max_length=20,
+ blank=True,
+ null=True)
+ '''Phone number'''
+
+ email = models.EmailField(verbose_name=_('Email'),
+ blank=True,
+ null=True)
+ '''Email'''
+
+ owner = models.CharField(verbose_name=_('Owner'),
+ max_length=100,
+ blank=True,
+ null=True)
+ '''Gym owner'''
+
+ zip_code = models.IntegerField(_(u'ZIP code'),
+ max_length=5,
+ blank=True,
+ null=True)
+ '''ZIP code'''
+
+ city = models.CharField(_(u'City'),
+ max_length=30,
+ blank=True,
+ null=True)
+ '''City'''
+
+ street = models.CharField(_(u'Street'),
+ max_length=30,
+ blank=True,
+ null=True)
+ '''Street'''
+
+ def __unicode__(self):
+ '''
+ Return a more human-readable representation
+ '''
+ return self.name
+
+ def delete(self, using=None):
+ '''
+ Make sure that there are no users with this gym in their profiles
+ '''
+
+ # Not accessing the profile directly to avoid cyclic import problems
+ for user in User.objects.filter(userprofile__gym=self).all():
+ user.userprofile.gym = None
+ user.userprofile.save()
+ super(Gym, self).delete(using)
+
+ def get_absolute_url(self):
+ '''
+ Return the URL for this object
+ '''
+ return reverse('gym:gym:user-list', kwargs={'pk': self.pk})
+
+ def get_owner_object(self):
+ '''
+ Gym has no owner information
+ '''
+ return None
diff --git a/wger/core/templates/gym/list.html b/wger/gym/templates/gym/list.html
similarity index 86%
rename from wger/core/templates/gym/list.html
rename to wger/gym/templates/gym/list.html
index 130e14096..a556ca119 100644
--- a/wger/core/templates/gym/list.html
+++ b/wger/gym/templates/gym/list.html
@@ -12,16 +12,16 @@
{% for gym in gym_list %}
<li class="list-group-item ">
<div class="pull-right">
- <a href="{% url 'core:gym:delete' gym.id %}"
+ <a href="{% url 'gym:gym:delete' gym.id %}"
class="btn btn-danger btn-xs wger-modal-dialog">
{% trans 'Delete' %}
</a>
- <a href="{% url 'core:gym:edit' gym.id %}"
+ <a href="{% url 'gym:gym:edit' gym.id %}"
class="btn btn-default btn-xs wger-modal-dialog">
{% trans 'Edit' %}
</a>
</div>
- <a href="{% url 'core:gym:user-list' gym.pk %}">{{gym}}</a>
+ <a href="{% url 'gym:gym:user-list' gym.pk %}">{{gym}}</a>
</li>
{% endfor %}
</ul>
@@ -34,7 +34,7 @@
<h4>{% trans "Options" %}</h4>
{% if perms.core.add_gym %}
<p>
- <a href="{% url 'core:gym:add' %}"
+ <a href="{% url 'gym:gym:add' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
diff --git a/wger/core/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
similarity index 94%
rename from wger/core/templates/gym/member_list.html
rename to wger/gym/templates/gym/member_list.html
index 6c9782953..fc7861751 100644
--- a/wger/core/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -22,7 +22,7 @@ $(document).ready( function () {
{% endblock %}
{% block content %}
-{% if perms.core.manage_gym or perms.core.gym_trainer %}
+{% if perms.gym.manage_gym or perms.gym.gym_trainer %}
<table class="table" id="main_member_list">
<thead>
<tr>
@@ -115,7 +115,7 @@ $(document).ready( function () {
</button>
<ul class="dropdown-menu" role="menu">
<li>
- <a href="{% url 'core:gym:edit' gym.id %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
+ <a href="{% url 'gym:gym:edit' gym.id %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
</li>
</ul>
</div>
@@ -158,10 +158,10 @@ $(document).ready( function () {
</tr>
</table>
-{% if perms.core.manage_gym %}
+{% if perms.gym.manage_gym %}
<h4>{% trans "Options" %}</h4>
<p>
- <a href="{% url 'core:gym:add-user' gym.pk %}"
+ <a href="{% url 'gym:gym:add-user' gym.pk %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
diff --git a/wger/core/templates/gym/new_user.html b/wger/gym/templates/gym/new_user.html
similarity index 88%
rename from wger/core/templates/gym/new_user.html
rename to wger/gym/templates/gym/new_user.html
index 9b7217f77..dd15e89fd 100644
--- a/wger/core/templates/gym/new_user.html
+++ b/wger/gym/templates/gym/new_user.html
@@ -40,7 +40,7 @@ cannot be recovered later.{% endblocktrans %}
<h4>{% trans "Options" %}</h4>
<p>
-<a href="{% url 'core:gym:new-user-data-export' %}" {% auto_link_css flavour %}>
+<a href="{% url 'gym:gym:new-user-data-export' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/save.svg' %}"
width="32"
height="32"
@@ -50,7 +50,7 @@ cannot be recovered later.{% endblocktrans %}
</p>
<p>
-<a href="{% url 'core:gym:user-list' new_user.userprofile.gym.pk %}" {% auto_link_css flavour %}>
+<a href="{% url 'gym:gym:user-list' new_user.userprofile.gym.pk %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/list.svg' %}"
width="32"
height="32"
diff --git a/wger/gym/tests/__init__.py b/wger/gym/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wger/core/tests/test_gym.py b/wger/gym/tests/test_gym.py
similarity index 89%
rename from wger/core/tests/test_gym.py
rename to wger/gym/tests/test_gym.py
index 6ebadb590..3c2fc7948 100644
--- a/wger/core/tests/test_gym.py
+++ b/wger/gym/tests/test_gym.py
@@ -12,10 +12,11 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+from django.contrib.auth.models import User
from django.core.urlresolvers import reverse_lazy
-from wger.core.models import Gym
from wger.core.models import UserProfile
+from wger.gym.models import Gym
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAccessTestCase
@@ -28,7 +29,7 @@ class GymOverviewTest(WorkoutManagerAccessTestCase):
'''
Tests accessing the gym overview page
'''
- url = 'core:gym:list'
+ url = 'gym:gym:list'
anonymous_fail = True
@@ -36,7 +37,7 @@ class GymUserOverviewTest(WorkoutManagerAccessTestCase):
'''
Tests accessing the gym user overview page
'''
- url = reverse_lazy('core:gym:user-list', kwargs={'pk': 1})
+ url = reverse_lazy('gym:gym:user-list', kwargs={'pk': 1})
anonymous_fail = True
@@ -45,8 +46,8 @@ class AddGymTestCase(WorkoutManagerAddTestCase):
Tests adding a new gym
'''
object_class = Gym
- url = 'core:gym:add'
- data = {'name': 'The name her'}
+ url = 'gym:gym:add'
+ data = {'name': 'The name here'}
pk = 4
@@ -56,7 +57,7 @@ class DeleteGymTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = Gym
- url = 'core:gym:delete'
+ url = 'gym:gym:delete'
pk = 2
@@ -66,7 +67,7 @@ class EditGymTestCase(WorkoutManagerEditTestCase):
'''
object_class = Gym
- url = 'core:gym:edit'
+ url = 'gym:gym:edit'
pk = 1
data = {'name': 'A different name'}
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
new file mode 100644
index 000000000..ac325212d
--- /dev/null
+++ b/wger/gym/tests/test_user.py
@@ -0,0 +1,217 @@
+# 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
+
+import datetime
+
+from django.contrib.auth.models import User
+from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
+from django.core.urlresolvers import reverse
+
+from wger.core.models import UserProfile
+from wger.gym.models import Gym
+from wger.manager.tests.testcase import WorkoutManagerTestCase
+from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+
+
+class GymAddUserTestCase(WorkoutManagerTestCase):
+ '''
+ Tests admin adding users to gyms
+ '''
+
+ def add_user(self, fail=False):
+ '''
+ Helper function to add users
+ '''
+ count_before = User.objects.all().count()
+ response = self.client.get(reverse('gym:gym:add-user', kwargs={'gym_pk': 1}))
+ if fail:
+ self.assertEqual(response.status_code, 403)
+ else:
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse('gym:gym:add-user', kwargs={'gym_pk': 1}),
+ {'first_name': 'Cletus',
+ 'last_name': 'Spuckle',
+ 'username': 'cletus',
+ 'email': '[email protected]',
+ 'role': 'admin'})
+ count_after = User.objects.all().count()
+ if fail:
+ self.assertEqual(response.status_code, 403)
+ self.assertEqual(count_before, count_after)
+ self.assertFalse(self.client.session.get('gym.user'))
+ else:
+ self.assertEqual(count_before + 1, count_after)
+ self.assertEqual(response.status_code, 302)
+ self.assertTrue(self.client.session['gym.user']['user_pk'], 3)
+ 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(new_user.userprofile.gym_id, 1)
+
+ def test_add_user_authorized(self):
+ '''
+ Tests adding a user as an administrator
+ '''
+ self.user_login('admin')
+ self.add_user()
+
+ def test_add_user_unauthorized(self):
+ '''
+ Tests adding a user a different user
+ '''
+ self.user_login('test')
+ self.add_user(fail=True)
+
+ def test_add_user_logged_out(self):
+ '''
+ Tests adding a user a logged out user
+ '''
+ self.add_user(fail=True)
+
+ def new_user_data_export(self, fail=False):
+ '''
+ Helper function to test exporting the data of a newly created user
+ '''
+ response = self.client.get(reverse('gym:gym:new-user-data-export'))
+ if fail:
+ self.assertIn(response.status_code, (302, 403))
+ else:
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response['Content-Type'], 'text/csv')
+ today = datetime.date.today()
+ filename = 'User-data-{t.year}-{t.month:02d}-{t.day:02d}-cletus.csv'.format(t=today)
+ self.assertEqual(response['Content-Disposition'],
+ 'attachment; filename={}'.format(filename))
+ self.assertGreaterEqual(len(response.content), 90)
+ self.assertLessEqual(len(response.content), 120)
+
+ def test_new_user_data_export(self):
+ '''
+ Test exporting the data of a newly created user
+ '''
+ self.user_login('admin')
+ self.add_user()
+ self.new_user_data_export(fail=False)
+
+ self.user_logout()
+ self.new_user_data_export(fail=True)
+
+ self.user_logout()
+ self.user_login('test')
+ self.new_user_data_export(fail=True)
+
+
+class TrainerLoginTestCase(WorkoutManagerTestCase):
+ '''
+ Tests the trainer login view (switching to user ID)
+ '''
+
+ def test_anonymous(self):
+ '''
+ Test the trainer login as an anonymous user
+ '''
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
+ self.assertEqual(response.status_code, 302)
+ self.assertFalse(self.client.session.get('trainer.identity'))
+
+ def test_user(self):
+ '''
+ Test the trainer login as a logged in user without rights
+ '''
+ self.user_login('test')
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
+ self.assertEqual(response.status_code, 403)
+ self.assertFalse(self.client.session.get('trainer.identity'))
+
+ def test_trainer(self):
+ '''
+ Test the trainer login as a logged in user with enough rights
+ '''
+ self.user_login('admin')
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ self.assertEqual(response.status_code, 302)
+ self.assertTrue(self.client.session.get('trainer.identity'))
+
+ def test_wrong_gym(self):
+ '''
+ Test changing the identity to a user in a different gym
+ '''
+ profile = UserProfile.objects.get(user_id=2)
+ profile.gym_id = 2
+ profile.save()
+ self.user_login('admin')
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ self.assertEqual(response.status_code, 403)
+ self.assertFalse(self.client.session.get('trainer.identity'))
+
+ def test_gym_trainer(self):
+ '''
+ Test changing the identity to a user with trainer rights
+ '''
+ user = User.objects.get(pk=2)
+ content_type = ContentType.objects.get_for_model(Gym)
+ permission = Permission.objects.get(content_type=content_type, codename='gym_trainer')
+ user.user_permissions.add(permission)
+
+ self.user_login('admin')
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ self.assertEqual(response.status_code, 403)
+ self.assertFalse(self.client.session.get('trainer.identity'))
+
+ def test_gym_manager(self):
+ '''
+ Test changing the identity to a user with gym management rights
+ '''
+ user = User.objects.get(pk=2)
+ content_type = ContentType.objects.get_for_model(Gym)
+ permission = Permission.objects.get(content_type=content_type, codename='manage_gym')
+ user.user_permissions.add(permission)
+
+ self.user_login('admin')
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ self.assertEqual(response.status_code, 403)
+ self.assertFalse(self.client.session.get('trainer.identity'))
+
+ def test_gyms_manager(self):
+ '''
+ Test changing the identity to a user with gyms management rights
+ '''
+ user = User.objects.get(pk=2)
+ content_type = ContentType.objects.get_for_model(Gym)
+ permission = Permission.objects.get(content_type=content_type, codename='manage_gyms')
+ user.user_permissions.add(permission)
+
+ self.user_login('admin')
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ self.assertEqual(response.status_code, 403)
+ self.assertFalse(self.client.session.get('trainer.identity'))
+
+
+class TrainerLogoutTestCase(WorkoutManagerTestCase):
+ '''
+ Tests the trainer logout view (switching back to trainer ID)
+ '''
+
+ def test_logout(self):
+ '''
+ Test the trainer login as an anonymous user
+ '''
+ self.user_login('admin')
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ self.assertTrue(self.client.session.get('trainer.identity'))
+
+ response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
+ self.assertFalse(self.client.session.get('trainer.identity'))
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
new file mode 100644
index 000000000..8733a8e7e
--- /dev/null
+++ b/wger/gym/urls.py
@@ -0,0 +1,56 @@
+# -*- 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.urls import patterns, url, include
+
+from wger.gym.views import gym
+
+# 'sub patterns' for gyms
+patterns_gym = patterns('',
+ url(r'^list$',
+ gym.GymListView.as_view(),
+ name='list'),
+ url(r'^new-user-data/view$',
+ gym.gym_new_user_info,
+ name='new-user-data'),
+ url(r'^new-user-data/export$',
+ gym.gym_new_user_info_export,
+ name='new-user-data-export'),
+ url(r'^(?P<pk>\d+)/members$',
+ gym.GymUserListView.as_view(),
+ name='user-list'),
+ url(r'^(?P<gym_pk>\d+)/add-member$',
+ gym.GymAddUserView.as_view(),
+ name='add-user'),
+ url(r'^add$',
+ gym.GymAddView.as_view(),
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit$',
+ gym.GymUpdateView.as_view(),
+ name='edit'),
+ url(r'^(?P<pk>\d+)/delete$',
+ gym.GymDeleteView.as_view(),
+ name='delete'),
+)
+
+#
+# All patterns for this app
+#
+urlpatterns = patterns('',
+
+ url(r'^', include(patterns_gym, namespace="gym")),
+)
\ No newline at end of file
diff --git a/wger/gym/views/__init__.py b/wger/gym/views/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wger/core/views/gym.py b/wger/gym/views/gym.py
similarity index 81%
rename from wger/core/views/gym.py
rename to wger/gym/views/gym.py
index 1a2d9f176..ecbe66aab 100644
--- a/wger/core/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -32,8 +32,8 @@ from django.views.generic import CreateView
from django.views.generic import UpdateView
from wger.core.forms import GymUserAddForm
-from wger.core.models import Gym
from wger.core.helpers import get_user_last_activity
+from wger.gym.models import Gym
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerDeleteMixin
from wger.utils.generic_views import WgerPermissionMixin
@@ -48,7 +48,7 @@ class GymListView(WgerPermissionMixin, ListView):
Overview of all available gyms
'''
model = Gym
- permission_required = 'core.manage_gyms'
+ permission_required = 'gym.manage_gyms'
template_name = 'gym/list.html'
@@ -57,16 +57,16 @@ class GymUserListView(WgerPermissionMixin, ListView):
Overview of all users for a specific gym
'''
model = User
- permission_required = ('core.manage_gym', 'core.gym_trainer', 'core.manage_gyms')
+ permission_required = ('gym.manage_gym', 'gym.gym_trainer', 'gym.manage_gyms')
template_name = 'gym/member_list.html'
def dispatch(self, request, *args, **kwargs):
'''
Only managers and trainers for this gym can access the members
'''
- if request.user.has_perm('core.manage_gyms') \
- or ((request.user.has_perm('core.manage_gym')
- or request.user.has_perm('core.gym_trainer'))
+ if request.user.has_perm('gym.manage_gyms') \
+ or ((request.user.has_perm('gym.manage_gym')
+ or request.user.has_perm('gym.gym_trainer'))
and request.user.userprofile.gym_id == int(self.kwargs['pk'])):
return super(GymUserListView, self).dispatch(request, *args, **kwargs)
return HttpResponseForbidden()
@@ -79,12 +79,12 @@ class GymUserListView(WgerPermissionMixin, ListView):
for u in User.objects.filter(userprofile__gym_id=self.kwargs['pk']):
out.append({'obj': u,
'last_log': get_user_last_activity(u),
- 'perms': {'manage_gym': u.has_perm('core.manage_gym'),
- 'manage_gyms': u.has_perm('core.manage_gyms'),
- 'gym_trainer': u.has_perm('core.gym_trainer'),
- 'any_admin': u.has_perm('core.manage_gym')
- or u.has_perm('core.manage_gyms')
- or u.has_perm('core.gym_trainer')}})
+ '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')}})
return out
def get_context_data(self, **kwargs):
@@ -106,10 +106,10 @@ class GymAddView(WgerFormMixin, CreateView):
'''
model = Gym
- success_url = reverse_lazy('core:gym:list')
+ success_url = reverse_lazy('gym:gym:list')
title = ugettext_lazy('Add gym')
- form_action = reverse_lazy('core:gym:add')
- permission_required = 'core.add_gym'
+ form_action = reverse_lazy('gym:gym:add')
+ permission_required = 'gym.add_gym'
@login_required
@@ -117,11 +117,11 @@ def gym_new_user_info(request):
'''
Shows info about a newly created user
'''
- if not request.user.has_perm('core.manage_gym'):
+ if not request.user.has_perm('gym.manage_gym'):
return HttpResponseForbidden()
if not request.session.get('gym.user'):
- return HttpResponseRedirect(reverse('core:gym:list'))
+ return HttpResponseRedirect(reverse('gym:gym:list'))
context = {'new_user': get_object_or_404(User, pk=request.session['gym.user']['user_pk']),
'password': request.session['gym.user']['password']}
@@ -133,11 +133,11 @@ def gym_new_user_info_export(request):
'''
Exports the info of newly created user
'''
- if not request.user.has_perm('core.manage_gym'):
+ if not request.user.has_perm('gym.manage_gym'):
return HttpResponseForbidden()
if not request.session.get('gym.user'):
- return HttpResponseRedirect(reverse('core:gym:list'))
+ return HttpResponseRedirect(reverse('gym:gym:list'))
new_user = get_object_or_404(User, pk=request.session['gym.user']['user_pk'])
new_username = new_user.username
@@ -169,8 +169,8 @@ class GymAddUserView(WgerFormMixin, CreateView):
model = User
title = ugettext_lazy('Add user to gym')
- success_url = reverse_lazy('core:gym:new-user-data')
- permission_required = 'core.manage_gym'
+ success_url = reverse_lazy('gym:gym:new-user-data')
+ permission_required = 'gym.manage_gym'
form_class = GymUserAddForm
def dispatch(self, request, *args, **kwargs):
@@ -181,7 +181,7 @@ class GymAddUserView(WgerFormMixin, CreateView):
return HttpResponseForbidden()
gym_id = request.user.userprofile.gym_id
- if request.user.has_perm('core.manage_gym') and gym_id == int(self.kwargs['gym_pk']):
+ if request.user.has_perm('gym.manage_gym') and gym_id == int(self.kwargs['gym_pk']):
return super(GymAddUserView, self).dispatch(request, *args, **kwargs)
return HttpResponseForbidden()
@@ -216,7 +216,7 @@ class GymAddUserView(WgerFormMixin, CreateView):
def get_context_data(self, **kwargs):
context = super(GymAddUserView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('core:gym:add-user',
+ context['form_action'] = reverse('gym:gym:add-user',
kwargs={'gym_pk': self.kwargs['gym_pk']})
return context
@@ -228,14 +228,14 @@ class GymUpdateView(WgerFormMixin, UpdateView):
model = Gym
title = ugettext_lazy('Edit gym')
- permission_required = 'core.change_gym'
+ permission_required = 'gym.change_gym'
def dispatch(self, request, *args, **kwargs):
'''
Only managers for this gym can add new members
'''
- if request.user.has_perm('core.manage_gym'):
+ if request.user.has_perm('gym.manage_gym'):
gym_id = request.user.userprofile.gym_id
if gym_id != int(self.kwargs['pk']):
return HttpResponseForbidden()
@@ -246,7 +246,7 @@ class GymUpdateView(WgerFormMixin, UpdateView):
Send some additional data to the template
'''
context = super(GymUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('core:gym:edit', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('gym:gym:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}'.format(self.object))
return context
@@ -257,8 +257,8 @@ class GymDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = Gym
- success_url = reverse_lazy('core:gym:list')
- permission_required = 'core.delete_gym'
+ success_url = reverse_lazy('gym:gym:list')
+ permission_required = 'gym.delete_gym'
def get_context_data(self, **kwargs):
'''
@@ -266,5 +266,5 @@ class GymDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
context = super(GymDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?'.format(self.object))
- context['form_action'] = reverse('core:gym:delete', kwargs={'pk': self.kwargs['pk']})
+ context['form_action'] = reverse('gym:gym:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/manager/fixtures/test-user-data.json b/wger/manager/fixtures/test-user-data.json
index 763f7bf6c..1837c99db 100644
--- a/wger/manager/fixtures/test-user-data.json
+++ b/wger/manager/fixtures/test-user-data.json
@@ -1,223 +1,4 @@
[
- {
- "pk": 1,
- "model": "auth.group",
- "fields": {
- "name": "admin",
- "permissions": [
- [
- "add_languageconfig",
- "config",
- "languageconfig"
- ],
- [
- "change_languageconfig",
- "config",
- "languageconfig"
- ],
- [
- "delete_languageconfig",
- "config",
- "languageconfig"
- ],
- [
- "add_daysofweek",
- "core",
- "daysofweek"
- ],
- [
- "change_daysofweek",
- "core",
- "daysofweek"
- ],
- [
- "delete_daysofweek",
- "core",
- "daysofweek"
- ],
- [
- "add_language",
- "core",
- "language"
- ],
- [
- "change_language",
- "core",
- "language"
- ],
- [
- "delete_language",
- "core",
- "language"
- ],
- [
- "add_license",
- "core",
- "license"
- ],
- [
- "change_license",
- "core",
- "license"
- ],
- [
- "delete_license",
- "core",
- "license"
- ],
- [
- "add_equipment",
- "exercises",
- "equipment"
- ],
- [
- "change_equipment",
- "exercises",
- "equipment"
- ],
- [
- "delete_equipment",
- "exercises",
- "equipment"
- ],
- [
- "add_exercise",
- "exercises",
- "exercise"
- ],
- [
- "change_exercise",
- "exercises",
- "exercise"
- ],
- [
- "delete_exercise",
- "exercises",
- "exercise"
- ],
- [
- "add_exercisecategory",
- "exercises",
- "exercisecategory"
- ],
- [
- "change_exercisecategory",
- "exercises",
- "exercisecategory"
- ],
- [
- "delete_exercisecategory",
- "exercises",
- "exercisecategory"
- ],
- [
- "add_exercisecomment",
- "exercises",
- "exercisecomment"
- ],
- [
- "change_exercisecomment",
- "exercises",
- "exercisecomment"
- ],
- [
- "delete_exercisecomment",
- "exercises",
- "exercisecomment"
- ],
- [
- "add_exerciseimage",
- "exercises",
- "exerciseimage"
- ],
- [
- "change_exerciseimage",
- "exercises",
- "exerciseimage"
- ],
- [
- "delete_exerciseimage",
- "exercises",
- "exerciseimage"
- ],
- [
- "add_muscle",
- "exercises",
- "muscle"
- ],
- [
- "change_muscle",
- "exercises",
- "muscle"
- ],
- [
- "delete_muscle",
- "exercises",
- "muscle"
- ],
- [
- "add_ingredient",
- "nutrition",
- "ingredient"
- ],
- [
- "change_ingredient",
- "nutrition",
- "ingredient"
- ],
- [
- "delete_ingredient",
- "nutrition",
- "ingredient"
- ],
- [
- "add_ingredientweightunit",
- "nutrition",
- "ingredientweightunit"
- ],
- [
- "change_ingredientweightunit",
- "nutrition",
- "ingredientweightunit"
- ],
- [
- "delete_ingredientweightunit",
- "nutrition",
- "ingredientweightunit"
- ],
- [
- "add_gym",
- "core",
- "gym"
- ],
- [
- "change_gym",
- "core",
- "gym"
- ],
- [
- "delete_gym",
- "core",
- "gym"
- ],
- [
- "gym_trainer",
- "core",
- "gym"
- ],
- [
- "manage_gym",
- "core",
- "gym"
- ],
- [
- "manage_gyms",
- "core",
- "gym"
- ]
- ]
- }
- },
{
"pk": 1,
"model": "auth.user",
@@ -287,14 +68,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "gym_trainer",
- "core",
- "gym"
+ "gym_trainer"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$BaNi2p83rltB$fYAI0Y1Wxyo1DoQf8uJC6W1y3fK9HzmI7t8bN//Mzvo=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -311,14 +90,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "gym_trainer",
- "core",
- "gym"
+ "gym_trainer"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$fgvAIvZjOH3f$ufayZhSXYPIgEhAiimIv6coPAPWcE0MwLZKVOTsJMM0=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -335,14 +112,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "gym_trainer",
- "core",
- "gym"
+ "gym_trainer"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$IsWVvB7BuF2p$ZwLPKiGB5wP6XVx5qYI2hKu5CWODQX3gVUDvXEr1XqM=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -359,14 +134,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "gym_trainer",
- "core",
- "gym"
+ "gym_trainer"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$U11MFXGmVZCy$znXUYY6Nt9t25mqGaCumxe9qe91pjQSr3fNWQb+SZms=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -383,14 +156,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "gym_trainer",
- "core",
- "gym"
+ "gym_trainer"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$N1LjFaFdFKXD$Bd4rFH4+pXY9R3xOOE6rLfFLZ9Y7zri+UmzAEWgADWE=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -407,14 +178,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "manage_gym",
- "core",
- "gym"
+ "gym_manager"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$YHyCIzh0CYNt$kEeqDYK9mw4d9+X5uxpav/rVAFEQuJyT2GRaTdtpaFI=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -431,14 +200,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "manage_gym",
- "core",
- "gym"
+ "gym_manager"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$JpQW8y8VEnIJ$LgBr+wCAU00/Lpec0Iq/og8oqEOT0yS2C8C1UakI1Uo=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -455,14 +222,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "manage_gym",
- "core",
- "gym"
+ "gym_manager"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$lHge7s7afhrb$Nb5M0jcoSX0ZbT3P70D4XDtke37u+NKdoBfXNd9LFng=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -479,14 +244,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "manage_gyms",
- "core",
- "gym"
+ "general_gym_manager"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$q1ZLvhPFKbRp$Q1dgERaIC1YSWdWI8XwxwDlP0J5c52n+Nu2UFKRT0Mc=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
@@ -503,14 +266,12 @@
"is_superuser": false,
"is_staff": false,
"last_login": "2013-03-30T00:23:21.592Z",
- "groups": [],
- "user_permissions": [
+ "groups": [
[
- "manage_gyms",
- "core",
- "gym"
+ "general_gym_manager"
]
],
+ "user_permissions": [],
"password": "pbkdf2_sha256$12000$gy3Rnm5zmJFb$3yjL9nKmDkwWlZwYVTUfUe/E2MPcWbYdrucauAx78lw=",
"email": "",
"date_joined": "2013-03-30T00:23:21.592Z"
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 91d4b0201..1a4a986bb 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -202,6 +202,7 @@ INSTALLED_APPS = (
'wger.software',
'wger.utils',
'wger.config',
+ 'wger.gym',
# reCaptcha support, see https://github.com/praekelt/django-recaptcha
'captcha',
diff --git a/wger/urls.py b/wger/urls.py
index 0777f90d3..f8a77f45a 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -138,6 +138,7 @@ urlpatterns = i18n_patterns('',
url(r'nutrition/', include('wger.nutrition.urls')),
url(r'software/', include('wger.software.urls', namespace='software', app_name='software')),
url(r'config/', include('wger.config.urls', namespace='config', app_name='config')),
+ url(r'gym/', include('wger.gym.urls', namespace='gym', app_name='gym')),
url(r'^browserid/', include('django_browserid.urls')),
url(r'^sitemap\.xml$',
'django.contrib.sitemaps.views.sitemap',