Self hosted FLOSS fitness/workout, nutrition and weight tracker
Update url routing for django 2
Scott Peshakc463e2834555
diff --git a/wger/config/urls.py b/wger/config/urls.pyindex 08722b5fc..519816f6c 100644--- a/wger/config/urls.py+++ b/wger/config/urls.py@@ -48,6 +48,6 @@ patterns_gym_config = [# Actual patterns#urlpatterns = [- url(r'^language-config/', include(patterns_language_config, namespace="language_config")),- url(r'^gym-config/', include(patterns_gym_config, namespace="gym_config")),+ url(r'^language-config/', include((patterns_language_config, 'language_config'), namespace="language_config")),+ url(r'^gym-config/', include((patterns_gym_config, 'gym_config'), namespace="gym_config")),]diff --git a/wger/core/urls.py b/wger/core/urls.pyindex e61913e17..d9a9d5c32 100644--- a/wger/core/urls.py+++ b/wger/core/urls.py@@ -203,9 +203,9 @@ urlpatterns = [misc.FeedbackClass.as_view(),name='feedback'),- url(r'^language/', include((patterns_language, namespace="language")),- url(r'^user/', include(patterns_user, namespace="user")),- url(r'^license/', include(patterns_license, namespace="license")),- url(r'^repetition-unit/', include(patterns_repetition_units, namespace="repetition-unit")),- url(r'^weight-unit/', include(patterns_weight_units, namespace="weight-unit")),+ url(r'^language/', include((patterns_language, 'language'), namespace="language")),+ url(r'^user/', include((patterns_user, 'user'), namespace="user")),+ url(r'^license/', include((patterns_license, 'license'), namespace="license")),+ url(r'^repetition-unit/', include((patterns_repetition_units, 'repetition-unit'), namespace="repetition-unit")),+ url(r'^weight-unit/', include((patterns_weight_units, 'weight-unit'), namespace="weight-unit")),]diff --git a/wger/email/urls.py b/wger/email/urls.pyindex 194eee117..e9c9db2d4 100644--- a/wger/email/urls.py+++ b/wger/email/urls.py@@ -37,5 +37,5 @@ patterns_email = [urlpatterns = [- url(r'^email/', include(patterns_email, namespace="email")),+ url(r'^email/', include((patterns_email, 'email'), namespace="email")),]diff --git a/wger/exercises/urls.py b/wger/exercises/urls.pyindex 693dd3f5a..7d0dfff98 100644--- a/wger/exercises/urls.py+++ b/wger/exercises/urls.py@@ -156,10 +156,10 @@ patterns_exercise = [urlpatterns = [- url(r'^muscle/', include(patterns_muscle, namespace="muscle")),- url(r'^image/', include(patterns_images, namespace="image")),- url(r'^comment/', include(patterns_comment, namespace="comment")),- url(r'^category/', include(patterns_category, namespace="category")),- url(r'^equipment/', include(patterns_equipment, namespace="equipment")),- url(r'^', include(patterns_exercise, namespace="exercise")),+ url(r'^muscle/', include((patterns_muscle, 'muscle'), namespace="muscle")),+ url(r'^image/', include((patterns_images, 'image'), namespace="image")),+ url(r'^comment/', include((patterns_comment, 'comment'), namespace="comment")),+ url(r'^category/', include((patterns_category, 'category'), namespace="category")),+ url(r'^equipment/', include((patterns_equipment, 'equipment'), namespace="equipment")),+ url(r'^', include((patterns_exercise, 'exercise'), namespace="exercise")),]diff --git a/wger/gym/urls.py b/wger/gym/urls.pyindex 035ea3607..9cc3dc696 100644--- a/wger/gym/urls.py+++ b/wger/gym/urls.py@@ -183,14 +183,14 @@ patterns_export = [# All patterns for this app#urlpatterns = [- url(r'^', include(patterns_gym, namespace="gym")),- url(r'^config/', include(patterns_gymconfig, namespace="config")),- url(r'^admin-config/', include(patterns_adminconfig, namespace="admin_config")),- url(r'^user-config/', include(patterns_userconfig, namespace="user_config")),- url(r'^notes/', include(patterns_admin_notes, namespace="admin_note")),- url(r'^document/', include(patterns_documents, namespace="document")),- url(r'^contract/', include(patterns_contracts, namespace="contract")),- url(r'^contract-type/', include(patterns_contract_types, namespace="contract_type")),- url(r'^contract-option/', include(patterns_contract_options, namespace="contract-option")),- url(r'^export/', include(patterns_export, namespace="export")),+ url(r'^', include((patterns_gym, 'gym'), namespace="gym")),+ url(r'^config/', include((patterns_gymconfig, 'config'), namespace="config")),+ url(r'^admin-config/', include((patterns_adminconfig, 'admin_config'), namespace="admin_config")),+ url(r'^user-config/', include((patterns_userconfig, 'user_config'), namespace="user_config")),+ url(r'^notes/', include((patterns_admin_notes, 'admin_note'), namespace="admin_note")),+ url(r'^document/', include((patterns_documents, 'document'), namespace="document")),+ url(r'^contract/', include((patterns_contracts, 'contract'), namespace="contract")),+ url(r'^contract-type/', include((patterns_contract_types, 'contract_type'), namespace="contract_type")),+ url(r'^contract-option/', include((patterns_contract_options, 'contract-option'), namespace="contract-option")),+ url(r'^export/', include((patterns_export, 'export'), namespace="export")),]diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 56ae3b8f9..88b337734 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -242,11 +242,11 @@ patterns_step = [urlpatterns = [- url(r'^', include(patterns_workout, namespace="workout")),- url(r'^log/', include(patterns_log, namespace="log")),- url(r'^day/', include(patterns_day, namespace="day")),- url(r'^set/', include(patterns_set, namespace="set")),- url(r'^session/', include(patterns_session, namespace="session")),- url(r'^schedule/', include(patterns_schedule, namespace="schedule")),- url(r'^schedule/step/', include(patterns_step, namespace="step")),+ url(r'^', include((patterns_workout, 'workout'), namespace="workout")),+ url(r'^log/', include((patterns_log, 'log'), namespace="log")),+ url(r'^day/', include((patterns_day, 'day'), namespace="day")),+ url(r'^set/', include((patterns_set, 'set'), namespace="set")),+ url(r'^session/', include((patterns_session, 'session'), namespace="session")),+ url(r'^schedule/', include((patterns_schedule, 'schedule'), namespace="schedule")),+ url(r'^schedule/step/', include((patterns_step, 'step'), namespace="step")),]diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.pyindex 7dfca62c1..9357f56ff 100644--- a/wger/nutrition/urls.py+++ b/wger/nutrition/urls.py@@ -184,12 +184,12 @@ patterns_calories = [urlpatterns = [- url(r'^', include(patterns_plan, namespace="plan")),- url(r'^meal/', include(patterns_meal, namespace="meal")),- url(r'^meal/item/', include(patterns_meal_item, namespace="meal_item")),- url(r'^ingredient/', include(patterns_ingredient, namespace="ingredient")),- url(r'^unit/', include(patterns_weight_unit, namespace="weight_unit")),- url(r'^unit-to-ingredient/', include(patterns_unit_ingredient, namespace="unit_ingredient")),- url(r'^calculator/bmi/', include(patterns_bmi, namespace="bmi")),- url(r'^calculator/calories/', include(patterns_calories, namespace="calories")),+ url(r'^', include((patterns_plan, 'plan'), namespace="plan")),+ url(r'^meal/', include((patterns_meal, 'meal'), namespace="meal")),+ url(r'^meal/item/', include((patterns_meal_item, 'meal_item'), namespace="meal_item")),+ url(r'^ingredient/', include((patterns_ingredient, 'ingredient'), namespace="ingredient")),+ url(r'^unit/', include((patterns_weight_unit, 'weight_unit'), namespace="weight_unit")),+ url(r'^unit-to-ingredient/', include((patterns_unit_ingredient, 'unit_ingredient'), namespace="unit_ingredient")),+ url(r'^calculator/bmi/', include((patterns_bmi, 'bmi'), namespace="bmi")),+ url(r'^calculator/calories/', include((patterns_calories, 'calories'), namespace="calories")),]diff --git a/wger/urls.py b/wger/urls.pyindex 76ed3d3da..dfcb50f2f 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -150,16 +150,16 @@ sitemaps = {'exercises': ExercisesSitemap,# The actual URLs#urlpatterns = i18n_patterns(- url(r'^admin/', include(admin.site.urls)),- url(r'^', include('wger.core.urls', namespace='core', app_name='core')),- url(r'workout/', include('wger.manager.urls', namespace='manager')),- url(r'exercise/', include('wger.exercises.urls', namespace='exercise')),- url(r'weight/', include('wger.weight.urls', namespace='weight')),- url(r'nutrition/', include('wger.nutrition.urls', namespace='nutrition')),- 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'email/', include('wger.email.urls', namespace='email')),+ url(r'^admin/', admin.site.urls),+ url(r'^', include(('wger.core.urls', 'core'), namespace='core')),+ url(r'workout/', include(('wger.manager.urls', 'manager'), namespace='manager')),+ url(r'exercise/', include(('wger.exercises.urls', 'exercise'), namespace='exercise')),+ url(r'weight/', include(('wger.weight.urls', 'weight'), namespace='weight')),+ url(r'nutrition/', include(('wger.nutrition.urls', 'nutrition'), namespace='nutrition')),+ url(r'software/', include(('wger.software.urls', 'software'), namespace='software')),+ url(r'config/', include(('wger.config.urls', 'config'), namespace='config')),+ url(r'gym/', include(('wger.gym.urls', 'gym'), namespace='gym')),+ url(r'email/', include(('wger.email.urls', 'email'), namespace='email')),url(r'^sitemap\.xml$',sitemap,{'sitemaps': sitemaps},