Self hosted FLOSS fitness/workout, nutrition and weight tracker
Update the order of schedule steps via the API
Roland Geider0409cf57f60d
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 33740a70d..3928f0695 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -127,12 +127,6 @@ class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):'''return ScheduleStep.objects.filter(schedule__user=self.request.user)- def pre_save(self, obj):- '''- Set the order- '''- obj.order = 1-def get_owner_objects(self):'''Return objects to check for ownership permissiondiff --git a/wger/manager/models.py b/wger/manager/models.pyindex c238bf4af..0178bbb1b 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -308,8 +308,7 @@ class ScheduleStep(models.Model):order = models.IntegerField(verbose_name=_('Order'),max_length=1,- default=1,- editable=False)+ default=1)def get_owner_object(self):'''diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.htmlindex c9bef2ff3..66e840351 100644--- a/wger/manager/templates/schedule/view.html+++ b/wger/manager/templates/schedule/view.html@@ -18,7 +18,19 @@ function init_sortable()// returns something in the form "step-1,step-2,step-3,"var order = $( this ).sortable('toArray');- $.get('/' + get_current_language() + "/workout/schedule/api/" + schedule_id + "/edit" + "?do=set_order&order=" + order);+ $.each(order, function (index, value) {+ if (value) {+ var step_pk = value.match(/\d+/)[0];+ $.ajax({+ url:'/api/v2/schedulestep/' + step_pk + '/',+ type: 'PATCH',+ data: {'order': index + 1}+ }).done(function(data) {+ //console.log(data);+ });+ }+ });+current_url = $("#current-url").data('currentUrl');// TODO: again, why do we need to do this twice. Otherwise, sometimesdiff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.pyindex 65a65d439..f4fac3493 100644--- a/wger/manager/tests/test_schedule.py+++ b/wger/manager/tests/test_schedule.py@@ -202,113 +202,6 @@ class ScheduleEndDateTestCase(WorkoutManagerTestCase):self.assertEqual(schedule.get_end_date(), schedule.start_date)-class ScheduleAjaxTestCase(WorkoutManagerTestCase):- '''- Tests the AJAX reordering call for steps- '''-- def test_schedule_api_owner_1(self):- '''- Tests the AJAX reordering as the owner user. All IDs exist and are owned- '''- self.user_login()- response = self.client.get(reverse('schedule-edit-api', kwargs={'pk': 2}),- {'do': 'set_order', 'order': 'step-3,step-1,step-2'})- self.assertEqual(response.status_code, 200)-- schedule = Schedule.objects.get(pk=2)- steps = schedule.schedulestep_set.all()- self.assertEqual(steps[0].id, 3)- self.assertEqual(steps[1].id, 1)- self.assertEqual(steps[2].id, 2)-- def test_schedule_api_owner_2(self):- '''- Tests the AJAX reordering as the owner user. All IDs exist and are owned- '''-- self.user_login()- response = self.client.get(reverse('schedule-edit-api', kwargs={'pk': 2}),- {'do': 'set_order', 'order': 'step-3,step-2,step-1'})- self.assertEqual(response.status_code, 200)-- schedule = Schedule.objects.get(pk=2)- steps = schedule.schedulestep_set.all()- self.assertEqual(steps[0].id, 3)- self.assertEqual(steps[1].id, 2)- self.assertEqual(steps[2].id, 1)-- def test_schedule_api_owner_3(self):- '''- Tests the AJAX reordering as the owner user, wrong step in the order list- '''- self.user_login()- response = self.client.get(reverse('schedule-edit-api', kwargs={'pk': 2}),- {'do': 'set_order', 'order': 'step-3,step-1,step-2,step-44'})- self.assertEqual(response.status_code, 200)-- schedule = Schedule.objects.get(pk=2)- steps = schedule.schedulestep_set.all()- self.assertEqual(steps[0].id, 3)- self.assertEqual(steps[1].id, 1)- self.assertEqual(steps[2].id, 2)-- def test_schedule_api_owner_4(self):- '''- Tests the AJAX reordering as the owner user, wrong step in the order list- '''- self.user_login()- response = self.client.get(reverse('schedule-edit-api', kwargs={'pk': 2}),- {'do': 'set_order', 'order': 'foo,bar-47,step-2,step-1,step-3'})- self.assertEqual(response.status_code, 200)-- schedule = Schedule.objects.get(pk=2)- steps = schedule.schedulestep_set.all()- self.assertEqual(steps[0].id, 2)- self.assertEqual(steps[1].id, 1)- self.assertEqual(steps[2].id, 3)-- def test_schedule_api_owner_5(self):- '''- Tests the AJAX reordering as the owner user, wrong step in the order list- '''- self.user_login()- response = self.client.get(reverse('schedule-edit-api', kwargs={'pk': 2}),- {'do': 'set_order', 'order': 'blahrg'})- self.assertEqual(response.status_code, 200)-- schedule = Schedule.objects.get(pk=2)- steps = schedule.schedulestep_set.all()- self.assertEqual(steps[0].id, 1)- self.assertEqual(steps[1].id, 2)- self.assertEqual(steps[2].id, 3)-- def test_schedule_api_other_1(self):- '''- Tests the AJAX reordering as a different user- '''- self.user_login('test')- response = self.client.get(reverse('schedule-edit-api', kwargs={'pk': 2}),- {'do': 'set_order', 'order': 'step-3,step-1,step-2'})- self.assertIn(response.status_code, STATUS_CODES_FAIL)-- def test_schedule_api_other_2(self):- '''- Tests the AJAX reordering as a different user, steps belong to a different schedule- '''- self.user_login('test')- response = self.client.get(reverse('schedule-edit-api', kwargs={'pk': 1}),- {'do': 'set_order', 'order': 'step-3,step-1,step-2'})- self.assertEqual(response.status_code, 200)-- # No change in order- schedule = Schedule.objects.get(pk=2)- steps = schedule.schedulestep_set.all()- self.assertEqual(steps[0].id, 1)- self.assertEqual(steps[1].id, 2)- self.assertEqual(steps[2].id, 3)--class ScheduleModelTestCase(WorkoutManagerTestCase):'''Tests the model methodsdiff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex fecc515a5..8885538ae 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -111,9 +111,6 @@ urlpatterns = patterns('',url(r'^workout/schedule/(?P<pk>\d+)/ical$',ical.export_schedule,name='schedule-ical'),- url(r'^workout/schedule/api/(?P<pk>\d+)/edit$',- schedule.edit_step_api,- name='schedule-edit-api'),# Schedule stepsurl(r'^workout/schedule/(?P<schedule_pk>\d+)/step/add$',diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.pyindex 3632f01b3..771d1301b 100644--- a/wger/manager/views/schedule.py+++ b/wger/manager/views/schedule.py@@ -111,32 +111,3 @@ class ScheduleEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):title = ugettext_lazy('Edit schedule')form_action_urlname = 'schedule-edit'login_required = True---def edit_step_api(request, pk):- schedule = get_object_or_404(Schedule, pk=pk, user=request.user)-- # Set the order- if request.GET.get('do') == 'set_order':- new_set_order = request.GET.get('order')-- order = 0- for i in new_set_order.strip(',').split(','):- # If the order items are not well formatted, ignore them- try:- step_id = i.split('-')[1]- except IndexError:- continue- order += 1-- # If the step does not exist or belongs to somebody else, ignore it- try:- step = ScheduleStep.objects.get(pk=step_id, schedule=schedule)- except ScheduleStep.DoesNotExist:- continue-- # Save- step.order = order- step.save()-- return HttpResponse(_('Success'))diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.pyindex 66511e637..2aeb552f4 100644--- a/wger/manager/views/schedule_step.py+++ b/wger/manager/views/schedule_step.py@@ -60,6 +60,7 @@ class StepCreateView(WgerFormMixin, CreateView, WgerPermissionMixin):class Meta:model = ScheduleStep+ exclude = ('order',)return StepForm@@ -106,6 +107,7 @@ class StepEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):class Meta:model = ScheduleStep+ exclude = ('order',)return StepForm