Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use new syntax for url patterns

Roland Geiderebe60400c6c6
diff --git a/wger/config/urls.py b/wger/config/urls.py
index 53a708b66..438d53166 100644
--- a/wger/config/urls.py
+++ b/wger/config/urls.py
@@ -23,7 +23,7 @@ from wger.config.views import gym_config
# sub patterns for languages
-patterns_language = patterns('',
+patterns_language = [
url(r'^list$',
languages.LanguageListView.as_view(),
name='overview'),
@@ -39,30 +39,30 @@ patterns_language = patterns('',
url(r'^add$',
languages.LanguageCreateView.as_view(),
name='add'),
-)
+]
# sub patterns for language configs
-patterns_language_config = patterns('',
+patterns_language_config = [
url(r'^(?P<pk>\d+)/edit',
language_config.LanguageConfigUpdateView.as_view(),
name='edit'),
-)
+]
# sub patterns for default gym
-patterns_gym_config = patterns('',
+patterns_gym_config = [
url(r'^edit$',
gym_config.GymConfigUpdateView.as_view(),
name='edit'),
-)
+]
#
# Actual patterns
#
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^language/', include(patterns_language, namespace="language")),
url(r'^language-config/', include(patterns_language_config, namespace="language_config")),
url(r'^gym-config/', include(patterns_gym_config, namespace="gym_config")),
-)
+]
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 0f9011acc..8f62edb6b 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -31,7 +31,7 @@ from wger.core.views import (
)
# sub patterns for languages
-patterns_user = patterns('',
+patterns_user = [
url(r'^login$',
user.login,
name='login'),
@@ -98,11 +98,11 @@ patterns_user = patterns('',
views.password_reset_complete,
{'template_name': 'user/password_reset_complete.html'},
name='password_reset_complete'),
-)
+]
# sub patterns for licenses
-patterns_license = patterns('',
+patterns_license = [
url(r'^license/list$',
license.LicenseListView.as_view(),
name='list'),
@@ -115,13 +115,13 @@ patterns_license = patterns('',
url(r'^license/(?P<pk>\d+)/delete',
license.LicenseDeleteView.as_view(),
name='delete'),
-)
+]
#
# Actual patterns
#
-urlpatterns = patterns('',
+urlpatterns = [
# The landing page
url(r'^$',
@@ -146,4 +146,4 @@ urlpatterns = patterns('',
url(r'^user/', include(patterns_user, namespace="user")),
url(r'^license/', include(patterns_license, namespace="license")),
-)
+]
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index ac9d73382..3a3c12521 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -30,7 +30,7 @@ from wger.exercises.views import (
# sub patterns for muscles
-patterns_muscle = patterns('',
+patterns_muscle = [
url(r'^overview/$',
muscles.MuscleListView.as_view(),
name='overview'),
@@ -43,10 +43,10 @@ patterns_muscle = patterns('',
url(r'^(?P<pk>\d+)/delete/$',
muscles.MuscleDeleteView.as_view(),
name='delete'),
-)
+]
# sub patterns for exercise images
-patterns_images = patterns('',
+patterns_images = [
url(r'^(?P<exercise_pk>\d+)/image/add$',
images.ExerciseImageAddView.as_view(),
name='add'),
@@ -62,10 +62,10 @@ patterns_images = patterns('',
url(r'^(?P<pk>\d+)/decline/$',
images.decline,
name='decline'),
-)
+]
# sub patterns for exercise comments
-patterns_comment = patterns('',
+patterns_comment = [
url(r'^(?P<exercise_pk>\d+)/comment/add/$',
comments.ExerciseCommentAddView.as_view(),
name='add'),
@@ -75,10 +75,10 @@ patterns_comment = patterns('',
url(r'^(?P<id>\d+)/delete/$',
comments.delete,
name='delete'),
-)
+]
# sub patterns for categories
-patterns_category = patterns('',
+patterns_category = [
url(r'^(?P<pk>\d+)/edit/$',
categories.ExerciseCategoryUpdateView.as_view(),
name='edit'),
@@ -88,10 +88,10 @@ patterns_category = patterns('',
url(r'^(?P<pk>\d+)/delete/$',
categories.ExerciseCategoryDeleteView.as_view(),
name='delete'),
-)
+]
# sub patterns for equipment
-patterns_equipment = patterns('',
+patterns_equipment = [
url(r'^list$',
equipment.EquipmentListView.as_view(),
name='list'),
@@ -107,11 +107,11 @@ patterns_equipment = patterns('',
url(r'^overview$',
equipment.EquipmentOverviewView.as_view(),
name='overview'),
-)
+]
# sub patterns for exercises
-patterns_exercise = patterns('',
+patterns_exercise = [
url(r'^overview/$',
exercises.ExerciseListView.as_view(),
name='overview'),
@@ -142,14 +142,14 @@ patterns_exercise = patterns('',
url(r'^(?P<pk>\d+)/decline/$',
exercises.decline,
name='decline'),
-)
+]
-urlpatterns = patterns('',
+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")),
-)
+]
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 573267e97..09be3294b 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -32,7 +32,7 @@ from wger.gym.views import (
# 'sub patterns' for gyms
-patterns_gym = patterns('',
+patterns_gym = [
url(r'^list$',
gym.GymListView.as_view(),
name='list'),
@@ -60,32 +60,32 @@ patterns_gym = patterns('',
url(r'^user/(?P<user_pk>\d+)/permission-edit$',
gym.gym_permissions_user_edit,
name='edit-user-permission'),
-)
+]
# 'sub patterns' for gym config
-patterns_gymconfig = patterns('',
+patterns_gymconfig = [
url(r'^(?P<pk>\d+)/edit$',
config.GymConfigUpdateView.as_view(),
name='edit'),
-)
+]
# 'sub patterns' for gym admin config
-patterns_adminconfig = patterns('',
+patterns_adminconfig = [
url(r'^(?P<pk>\d+)/edit$',
admin_config.ConfigUpdateView.as_view(),
name='edit'),
-)
+]
# 'sub patterns' for gym user config
-patterns_userconfig = patterns('',
+patterns_userconfig = [
url(r'^(?P<pk>\d+)/edit$',
user_config.ConfigUpdateView.as_view(),
name='edit'),
-)
+]
# 'sub patterns' for admin notes
-patterns_admin_notes = patterns('',
+patterns_admin_notes = [
url(r'^list/user/(?P<user_pk>\d+)$',
admin_notes.ListView.as_view(),
name='list'),
@@ -98,10 +98,10 @@ patterns_admin_notes = patterns('',
url(r'^(?P<pk>\d+)/delete$',
admin_notes.DeleteView.as_view(),
name='delete'),
-)
+]
# 'sub patterns' for user documents
-patterns_documents = patterns('',
+patterns_documents = [
url(r'^list/user/(?P<user_pk>\d+)$',
document.ListView.as_view(),
name='list'),
@@ -114,17 +114,16 @@ patterns_documents = patterns('',
url(r'^(?P<pk>\d+)/delete$',
document.DeleteView.as_view(),
name='delete'),
-)
+]
#
# All patterns for this app
#
-urlpatterns = patterns('',
-
+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")),
-)
+]
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 21858b8b6..054da4b0f 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -31,7 +31,7 @@ from wger.manager.views import (
)
# sub patterns for workout logs
-patterns_log = patterns('',
+patterns_log = [
url(r'^(?P<pk>\d+)/view$',
log.WorkoutLogDetailView.as_view(),
name='log'),
@@ -44,11 +44,11 @@ patterns_log = patterns('',
url(r'^(?P<workout_pk>\d+)/add$', # not used?
log.WorkoutLogAddView.as_view(),
name='add'),
-)
+]
# sub patterns for workouts
-patterns_workout = patterns('',
+patterns_workout = [
url(r'^overview$',
workout.overview,
name='overview'),
@@ -103,11 +103,11 @@ patterns_workout = patterns('',
url(r'^(?P<day_pk>\d+)/timer$',
workout.timer,
name='timer'),
-)
+]
# sub patterns for workout sessions
-patterns_session = patterns('',
+patterns_session = [
url(r'^(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
workout_session.WorkoutSessionAddView.as_view(),
name='add'),
@@ -117,11 +117,11 @@ patterns_session = patterns('',
url(r'^(?P<pk>\d+)/delete/(?P<logs>(session|logs))?$',
workout_session.WorkoutSessionDeleteView.as_view(),
name='delete'),
-)
+]
# sub patterns for workout days
-patterns_day = patterns('',
+patterns_day = [
url(r'^(?P<pk>\d+)/edit/$',
login_required(day.DayEditView.as_view()),
name='edit'),
@@ -137,11 +137,10 @@ patterns_day = patterns('',
url(r'^(?P<pk>\d+)/log/add/$',
log.add,
name='log'),
-)
+]
# sub patterns for workout sets
-patterns_set = patterns('',
- # Sets and Settings
+patterns_set = [
url(r'^day/(?P<day_pk>\d+)/set/add/$',
set.create,
name='add'),
@@ -154,11 +153,11 @@ patterns_set = patterns('',
url(r'^(?P<pk>\d+)/edit/$',
set.edit,
name='edit'),
-)
+]
# sub patterns for schedules
-patterns_schedule = patterns('',
+patterns_schedule = [
url(r'^overview$',
schedule.overview,
name='overview'),
@@ -189,12 +188,12 @@ patterns_schedule = patterns('',
url(r'^(?P<pk>\d+)/pdf$',
schedule.export_pdf,
name='pdf'),
-)
+]
# sub patterns for schedule steps
-patterns_step = patterns('',
+patterns_step = [
url(r'^(?P<schedule_pk>\d+)/step/add$',
schedule_step.StepCreateView.as_view(),
name='add'),
@@ -204,11 +203,11 @@ patterns_step = patterns('',
url(r'^(?P<pk>\d+)/delete$',
schedule_step.StepDeleteView.as_view(),
name='delete'),
-)
+]
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^', include(patterns_workout, namespace="workout")),
url(r'^log/', include(patterns_log, namespace="log")),
url(r'^day/', include(patterns_day, namespace="day")),
@@ -216,4 +215,4 @@ urlpatterns = patterns('',
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")),
-)
+]
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index c3c5159b8..d768fc3f4 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -34,7 +34,7 @@ from wger.nutrition.views import (
)
# sub patterns for nutritional plans
-patterns_plan = patterns('',
+patterns_plan = [
url(r'^overview/$',
plan.overview,
name='overview'),
@@ -59,11 +59,11 @@ patterns_plan = patterns('',
url(r'^(?P<id>\d+)/pdf/$',
plan.export_pdf,
name='export-pdf'),
-)
+]
# sub patterns for meals
-patterns_meal = patterns('',
+patterns_meal = [
url(r'^(?P<plan_pk>\d+)/meal/add/$',
login_required(meal.MealCreateView.as_view()),
name='add'),
@@ -73,11 +73,11 @@ patterns_meal = patterns('',
url(r'^(?P<id>\d+)/delete/$',
meal.delete_meal,
name='delete'),
-)
+]
# sub patterns for meal items
-patterns_meal_item = patterns('',
+patterns_meal_item = [
url(r'^(?P<meal_id>\d+)/item/add/$',
login_required(meal_item.MealItemCreateView.as_view()),
name='add'),
@@ -87,11 +87,11 @@ patterns_meal_item = patterns('',
url(r'^(?P<item_id>\d+)/delete/$',
meal_item.delete_meal_item,
name='delete'),
-)
+]
# sub patterns for ingredient
-patterns_ingredient = patterns('',
+patterns_ingredient = [
url(r'^(?P<pk>\d+)/delete/$',
ingredient.IngredientDeleteView.as_view(),
name='delete'),
@@ -119,11 +119,11 @@ patterns_ingredient = patterns('',
url(r'^(?P<id>\d+)/view/(?P<slug>[-\w]+)/$',
ingredient.view,
name='view'),
-)
+]
# sub patterns for weight units
-patterns_weight_unit = patterns('',
+patterns_weight_unit = [
url(r'^list/$',
unit.WeightUnitListView.as_view(),
name='list'),
@@ -136,11 +136,11 @@ patterns_weight_unit = patterns('',
url(r'^(?P<pk>\d+)/edit/$',
unit.WeightUnitUpdateView.as_view(),
name='edit'),
-)
+]
# sub patterns for weight units / ingredient cross table
-patterns_unit_ingredient = patterns('',
+patterns_unit_ingredient = [
url(r'^add/(?P<ingredient_pk>\d+)/$',
unit_ingredient.WeightUnitIngredientCreateView.as_view(),
name='add'),
@@ -150,11 +150,11 @@ patterns_unit_ingredient = patterns('',
url(r'^(?P<pk>\d+)/delete/$',
unit_ingredient.WeightUnitIngredientDeleteView.as_view(),
name='delete'),
-)
+]
# sub patterns for BMI calculator
-patterns_bmi = patterns('',
+patterns_bmi = [
url(r'^$',
bmi.view,
name='view'),
@@ -164,11 +164,11 @@ patterns_bmi = patterns('',
url(r'^chart-data$',
bmi.chart_data,
name='chart-data'), # JS
-)
+]
# sub patterns for calories calculator
-patterns_calories = patterns('',
+patterns_calories = [
url(r'^$',
calculator.view,
name='view'),
@@ -178,10 +178,10 @@ patterns_calories = patterns('',
url(r'^activities$',
calculator.calculate_activities,
name='activities'), # JS
-)
+]
-urlpatterns = patterns('',
+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")),
@@ -190,4 +190,4 @@ urlpatterns = patterns('',
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")),
-)
+]
diff --git a/wger/software/urls.py b/wger/software/urls.py
index 3daec914e..7c6cc7034 100644
--- a/wger/software/urls.py
+++ b/wger/software/urls.py
@@ -17,7 +17,7 @@
from django.conf.urls import patterns, url
from django.views.generic import TemplateView
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^issues$',
TemplateView.as_view(template_name="issues.html"),
@@ -49,4 +49,4 @@ urlpatterns = patterns('',
url(r'^api$',
TemplateView.as_view(template_name="api.html"),
name='api'),
-)
+]
diff --git a/wger/urls.py b/wger/urls.py
index 54b88549e..884ab09d9 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -129,7 +129,7 @@ sitemaps = {'exercises': ExercisesSitemap,
#
# The actual URLs
#
-urlpatterns = i18n_patterns('',
+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')),
@@ -149,7 +149,7 @@ urlpatterns = i18n_patterns('',
#
# URLs without language prefix
#
-urlpatterns = urlpatterns + patterns('',
+urlpatterns = urlpatterns + [
url(r'^robots\.txt$',
TextTemplateView.as_view(template_name="robots.txt"),
name='robots'),
@@ -168,4 +168,4 @@ urlpatterns = urlpatterns + patterns('',
nutrition_api_views.search,
name='ingredient-search'),
url(r'^api/v2/', include(router.urls)),
-)
+]
diff --git a/wger/weight/urls.py b/wger/weight/urls.py
index fc947adde..6e0767f29 100644
--- a/wger/weight/urls.py
+++ b/wger/weight/urls.py
@@ -22,7 +22,7 @@ from wger.weight.forms import WeightCsvImportForm
from wger.weight import views
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^add/$',
login_required(views.WeightAddView.as_view()),
name='add'),
@@ -50,4 +50,4 @@ urlpatterns = patterns('',
url(r'^api/get_weight_data/$', # JS
views.get_weight_data,
name='weight-data'),
-)
+]