diff --git a/rowers/rower_rules.py b/rowers/rower_rules.py index dad9d33d..bac7b6ed 100644 --- a/rowers/rower_rules.py +++ b/rowers/rower_rules.py @@ -79,7 +79,7 @@ def is_protrial(user): ispromember = is_promember | is_protrial @rules.predicate -def is_plan(user): +def is_plantrial(user): try: r = user.rower except AttributeError: diff --git a/rowers/tests/test_permissions.py b/rowers/tests/test_permissions.py index d2ddc96a..ad2d745e 100644 --- a/rowers/tests/test_permissions.py +++ b/rowers/tests/test_permissions.py @@ -652,7 +652,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) - url = reverse('rower_prefs_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_prefs_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,200) @@ -663,7 +663,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) - url = reverse('rower_prefs_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_prefs_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,403) @@ -676,7 +676,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) - url = reverse('rower_favoritecharts_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_favoritecharts_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,200) @@ -687,7 +687,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) - url = reverse('rower_favoritecharts_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_favoritecharts_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,403) @@ -700,7 +700,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) - url = reverse('rower_exportsettings_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_exportsettings_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,200) @@ -711,7 +711,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) - url = reverse('rower_exportsettings_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_exportsettings_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,403) @@ -724,7 +724,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) - url = reverse('rower_edit_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_edit_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,200) @@ -735,7 +735,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.ucoach.username, password=self.ucoachpassword) self.assertTrue(login) - url = reverse('rower_edit_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_edit_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,403) @@ -981,7 +981,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.uplan2.username, password=self.uplan2password) self.assertTrue(login) - url = reverse('rower_prefs_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_prefs_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,403) @@ -1103,7 +1103,7 @@ class PermissionsViewTests(TestCase): login = self.c.login(username=self.upro2.username, password=self.upro2password) self.assertTrue(login) - url = reverse('rower_prefs_view',kwargs={'userid':self.ubasic.id}) + url = reverse('rower_prefs_view',kwargs={'id':self.ubasic.id}) response = self.c.get(url) self.assertEqual(response.status_code,403) diff --git a/rowers/urls.py b/rowers/urls.py index 15b7768f..de413d87 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -447,7 +447,7 @@ urlpatterns = [ re_path(r'^user-multiflex-data/$',views.multiflex_data,name='multiflex_data'), re_path(r'^me/deactivate/$',views.deactivate_user,name='deactivate_user'), re_path(r'^me/delete/$',views.remove_user,name='remove_user'), - re_path(r'^survey/$',views.survey,name='survey'), +# re_path(r'^survey/$',views.survey,name='survey'), re_path(r'^me/gdpr-optin-confirm/?/$',views.user_gdpr_confirm,name='user_gdpr_confirm'), re_path(r'^me/gdpr-optin-confirm/$',views.user_gdpr_confirm,name='user_gdpr_confirm'), re_path(r'^me/gdpr-optin/?/$',views.user_gdpr_optin,name='user_gdpr_optin'), @@ -455,7 +455,7 @@ urlpatterns = [ re_path(r'^me/teams/$',views.rower_teams_view,name='rower_teams_view'), re_path(r'^me/calcdps/$',views.rower_calcdps_view,name='rower_calcdps_view'), re_path(r'^me/exportsettings/$',views.rower_exportsettings_view,name='rower_exportsettings_view'), - re_path(r'^me/exportsettings/user/(?P\d+)/$',views.rower_exportsettings_view,name='rower_exportsettings_view'), + re_path(r'^me/exportsettings/user/(?P\d+)/$',views.rower_exportsettings_view,name='rower_exportsettings_view'), re_path(r'^team/(?P\d+)/$',views.team_view,name='team_view'), re_path(r'^team/(?P\d+)/memberstats/$',views.team_members_stats_view,name='team_members_stats_view'), re_path(r'^team/(?P\d+)/edit/$',views.team_edit_view,name='team_edit_view'), @@ -500,10 +500,10 @@ urlpatterns = [ re_path(r'^me/request/(\w+.*)/$',views.manager_requests_view,name='manager_requests_view'), re_path(r'^me/request/$',views.manager_requests_view,name='manager_requests_view'), re_path(r'^me/edit/$',views.rower_edit_view,name='rower_edit_view'), - re_path(r'^me/edit/user/(?P\d+)/$',views.rower_edit_view,name='rower_edit_view'), + re_path(r'^me/edit/user/(?P\d+)/$',views.rower_edit_view,name='rower_edit_view'), re_path(r'^me/preferences/$',views.rower_prefs_view,name='rower_prefs_view'), re_path(r'^me/transactions/$',views.transactions_view,name='transactions_view'), - re_path(r'^me/preferences/user/(?P\d+)/$',views.rower_prefs_view,name='rower_prefs_view'), + re_path(r'^me/preferences/user/(?P\d+)/$',views.rower_prefs_view,name='rower_prefs_view'), re_path(r'^me/edit/(.+.*)/$',views.rower_edit_view,name='rower_edit_view'), re_path(r'^me/c2authorize/$',views.rower_c2_authorize,name='rower_c2_authorize'), re_path(r'^me/polarauthorize/$',views.rower_polar_authorize,name='rower_polar_authorize'), diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index b6bcca18..21c5e454 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -66,7 +66,7 @@ urlpatterns += [ {'next_page': '/'}, name='logout',), re_path(r'^rowers/',include('rowers.urls')), - re_path(r'^survey/',include('survey.urls')), +# re_path(r'^survey/',include('survey.urls')), # re_path(r'^cvkbrno/',include('cvkbrno.urls')), # re_path(r'^admin/rq/',include('django_rq_dashboard.urls')), re_path(r'^call\_back',rowersviews.rower_process_callback),