Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add ability to copy shared workouts

James Simas3143f637be7f
diff --git a/AUTHORS.rst b/AUTHORS.rst
index dbd72f367..4bb48da27 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -10,6 +10,7 @@ Developers
* Matheus Zorzete Marchiore - https://github.com/marchiore
* Yu Yu Aung - https://github.com/max111
* Laszlo Ratsko - https://github.com/rlaszlo
+* James Simas - https://github.com/jamessimas
Translators
-----------
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index 1c3c5ef68..b61bf5a06 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -171,7 +171,6 @@ $(document).ready(function() {
</a>
</p>
-{% if is_owner %}
<p>
<a href="{% url 'manager:workout:copy' workout.id %}"
class="wger-modal-dialog">
@@ -184,6 +183,7 @@ $(document).ready(function() {
</a>
</p>
+{% if is_owner %}
<p>
<a href="{% url 'manager:workout:delete' workout.id %}"
class="wger-modal-dialog">
diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.py
index a7ea46765..c86155780 100644
--- a/wger/manager/tests/test_copy_workout.py
+++ b/wger/manager/tests/test_copy_workout.py
@@ -17,6 +17,7 @@ import logging
from django.core.urlresolvers import reverse
from wger.manager.models import Workout
+from wger.core.models import UserProfile
from wger.manager.tests.testcase import WorkoutManagerTestCase
logger = logging.getLogger(__name__)
@@ -88,18 +89,34 @@ class CopyWorkoutTestCase(WorkoutManagerTestCase):
for k in range(sets_original[j].exercises.count()):
self.assertEqual(exercises_original[k], exercises_copy[k])
- def test_copy_workout_other(self):
+ def test_copy_workout_owner(self):
+ '''
+ Test copying a workout as the owner user
+ '''
+
+ self.user_login('test')
+ self.copy_workout(owner=True)
+
+ def test_copy_shared_not_allowed(self):
'''
- Test copying a workout as different user
+ Test copying a workout from another shared user where user does not share workouts
'''
+ profile = UserProfile.objects.get(user__username='test')
+ profile.ro_access = False
+ profile.save()
self.user_login('admin')
- self.copy_workout(owner=False)
+ response = self.client.get(reverse('manager:workout:copy', kwargs={'pk': '3'}))
+ self.assertEqual(response.status_code, 403)
- def test_copy_workout_owner(self):
+ def test_copy_shared_allowed(self):
'''
- Test copying a workout as the owner user
+ Test copying a workout from another shared user where user does share workouts
'''
+ profile = UserProfile.objects.get(user__username='test')
+ profile.ro_access = True
+ profile.save()
- self.user_login('test')
- self.copy_workout(owner=True)
+ self.user_login('admin')
+ response = self.client.get(reverse('manager:workout:copy', kwargs={'pk': '3'}))
+ self.assertEqual(response.status_code, 200)
\ No newline at end of file
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 1f86ded58..21f1c3c17 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -114,7 +114,12 @@ def copy_workout(request, pk):
Makes a copy of a workout
'''
- workout = get_object_or_404(Workout, pk=pk, user=request.user)
+ workout = get_object_or_404(Workout, pk=pk)
+ user = workout.user
+ is_owner = request.user == user
+
+ if not is_owner and not user.userprofile.ro_access:
+ return HttpResponseForbidden()
# Process request
if request.method == 'POST':
@@ -128,6 +133,7 @@ def copy_workout(request, pk):
workout_copy = workout
workout_copy.pk = None
workout_copy.comment = workout_form.cleaned_data['comment']
+ workout_copy.user = request.user
workout_copy.save()
# Copy the days