Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add UAAwareMixin

Scott Peshak09fedb7a2f63
diff --git a/wger/core/views/languages.py b/wger/core/views/languages.py
index 888636eab..7155de212 100644
--- a/wger/core/views/languages.py
+++ b/wger/core/views/languages.py
@@ -42,14 +42,15 @@ from django.views.generic import (
from wger.core.models import Language
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
logger = logging.getLogger(__name__)
-class LanguageListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class LanguageListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Show an overview of all languages
'''
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index 5756b6b9e..ea2249fba 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -41,14 +41,15 @@ from django.views.generic import (
from wger.core.models import License
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
logger = logging.getLogger(__name__)
-class LicenseListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class LicenseListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available licenses
'''
diff --git a/wger/core/views/repetition_units.py b/wger/core/views/repetition_units.py
index 9d4ddc39b..ddb421dfe 100644
--- a/wger/core/views/repetition_units.py
+++ b/wger/core/views/repetition_units.py
@@ -39,14 +39,15 @@ from django.views.generic import (
from wger.core.models import RepetitionUnit
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
logger = logging.getLogger(__name__)
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available setting units
'''
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 04bbc7eeb..25a261090 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -77,7 +77,8 @@ from wger.nutrition.models import NutritionPlan
from wger.utils.constants import USER_TAB
from wger.utils.generic_views import (
WgerFormMixin,
- WgerMultiplePermissionRequiredMixin
+ WgerMultiplePermissionRequiredMixin,
+ UAAwareViewMixin
)
from wger.utils.user_agents import (
check_request_amazon,
@@ -517,7 +518,7 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
return context
-class UserListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class UserListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all users in the instance
'''
diff --git a/wger/core/views/weight_units.py b/wger/core/views/weight_units.py
index ddb0f13ad..1393197e9 100644
--- a/wger/core/views/weight_units.py
+++ b/wger/core/views/weight_units.py
@@ -39,14 +39,15 @@ from django.views.generic import (
from wger.core.models import WeightUnit
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
logger = logging.getLogger(__name__)
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available weight units
'''
diff --git a/wger/email/views/gym.py b/wger/email/views/gym.py
index 3a7bc22f6..44b951c08 100644
--- a/wger/email/views/gym.py
+++ b/wger/email/views/gym.py
@@ -33,9 +33,10 @@ from wger.email.models import (
Log
)
from wger.gym.models import Gym
+from wger.utils.generic_views import UAAwareViewMixin
-class EmailLogListView(PermissionRequiredMixin, generic.ListView):
+class EmailLogListView(PermissionRequiredMixin, UAAwareViewMixin, generic.ListView):
'''
Shows a list with all sent emails
'''
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index 4e9cc36cc..4cce3ae45 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -41,7 +41,8 @@ from django.views.generic import (
from wger.exercises.models import ExerciseCategory
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
from wger.utils.language import load_language
@@ -49,7 +50,7 @@ from wger.utils.language import load_language
logger = logging.getLogger(__name__)
-class ExerciseCategoryListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class ExerciseCategoryListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all categories, for administration purposes
'''
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index 5a9042920..0ccc7b88d 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -43,7 +43,8 @@ from wger.exercises.models import Equipment
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
from wger.utils.language import load_item_languages
@@ -55,7 +56,7 @@ Exercise equipment
'''
-class EquipmentListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class EquipmentListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Generic view to list all equipments
'''
@@ -134,7 +135,7 @@ class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequire
return context
-class EquipmentOverviewView(ListView):
+class EquipmentOverviewView(UAAwareViewMixin, ListView):
'''
Overview with all exercises, group by equipment
'''
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 235346a5f..c29316663 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -66,7 +66,8 @@ from wger.manager.models import WorkoutLog
from wger.utils.cache import cache_mapper
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin,
)
from wger.utils.language import (
load_item_languages,
@@ -79,13 +80,11 @@ from wger.utils.widgets import (
)
from wger.weight.helpers import process_log_entries
from wger.utils.helpers import ua_aware_render
-from django_user_agents.utils import get_user_agent
-
logger = logging.getLogger(__name__)
-class ExerciseListView(ListView):
+class ExerciseListView(UAAwareViewMixin, ListView):
'''
Generic view to list all exercises
'''
@@ -335,7 +334,7 @@ class ExerciseDeleteView(WgerDeleteMixin,
return context
-class PendingExerciseListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class PendingExerciseListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Generic view to list all weight units
'''
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index 587da928d..0af94eb7c 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -42,7 +42,8 @@ from wger.config.models import LanguageConfig
from wger.exercises.models import Muscle
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
from wger.utils.language import load_item_languages
@@ -50,7 +51,7 @@ from wger.utils.language import load_item_languages
logger = logging.getLogger(__name__)
-class MuscleListView(ListView):
+class MuscleListView(UAAwareViewMixin, ListView):
'''
Overview of all muscles and their exercises
'''
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index 72417044f..8da74496a 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -40,14 +40,15 @@ from django.views.generic import (
from wger.gym.models import AdminUserNote
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
logger = logging.getLogger(__name__)
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available admin notes
'''
diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.py
index a52bbfad5..36a666ccc 100644
--- a/wger/gym/views/contract.py
+++ b/wger/gym/views/contract.py
@@ -39,7 +39,10 @@ from django.views.generic import (
# wger
from wger.gym.models import Contract
-from wger.utils.generic_views import WgerFormMixin
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ UAAwareViewMixin
+)
logger = logging.getLogger(__name__)
@@ -166,7 +169,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
return context
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available admin notes
'''
diff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.py
index 96896c5ce..83772a9f8 100644
--- a/wger/gym/views/contract_option.py
+++ b/wger/gym/views/contract_option.py
@@ -43,7 +43,8 @@ from wger.gym.models import (
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
@@ -172,7 +173,7 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
return context
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available contract options
'''
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
index 06df1188a..eaccc60c6 100644
--- a/wger/gym/views/contract_type.py
+++ b/wger/gym/views/contract_type.py
@@ -43,7 +43,8 @@ from wger.gym.models import (
)
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
@@ -172,7 +173,7 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
return context
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available contract options
'''
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index ef221a6f9..4b9dd1372 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -40,14 +40,15 @@ from django.views.generic import (
from wger.gym.models import UserDocument
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
logger = logging.getLogger(__name__)
-class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class ListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available admin notes
'''
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 06a5d5a6b..946862eed 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -69,7 +69,8 @@ from wger.gym.models import (
from wger.utils.generic_views import (
WgerDeleteMixin,
WgerFormMixin,
- WgerMultiplePermissionRequiredMixin
+ WgerMultiplePermissionRequiredMixin,
+ UAAwareViewMixin
)
from wger.utils.helpers import (
password_generator,
@@ -79,7 +80,7 @@ from wger.utils.helpers import (
logger = logging.getLogger(__name__)
-class GymListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class GymListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all available gyms
'''
@@ -96,7 +97,7 @@ class GymListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
return context
-class GymUserListView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, ListView):
+class GymUserListView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Overview of all users for a specific gym
'''
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index f539634b9..b7ce8085d 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -52,7 +52,8 @@ from wger.utils.cache import cache_mapper
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
from wger.utils.language import (
load_ingredient_languages,
@@ -67,7 +68,7 @@ logger = logging.getLogger(__name__)
# ************************
# Ingredient functions
# ************************
-class IngredientListView(ListView):
+class IngredientListView(UAAwareViewMixin, ListView):
'''
Show an overview of all ingredients
'''
@@ -208,7 +209,7 @@ class IngredientCreateView(IngredientMixin, CreateView):
return super(IngredientCreateView, self).dispatch(request, *args, **kwargs)
-class PendingIngredientListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
+class PendingIngredientListView(LoginRequiredMixin, PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
List all ingredients pending review
'''
diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.py
index 353f2fbd1..3ba28745a 100644
--- a/wger/nutrition/views/unit.py
+++ b/wger/nutrition/views/unit.py
@@ -42,7 +42,8 @@ from wger.nutrition.models import WeightUnit
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
WgerDeleteMixin,
- WgerFormMixin
+ WgerFormMixin,
+ UAAwareViewMixin
)
from wger.utils.language import load_language
@@ -53,7 +54,7 @@ logger = logging.getLogger(__name__)
# ************************
-class WeightUnitListView(PermissionRequiredMixin, ListView):
+class WeightUnitListView(PermissionRequiredMixin, UAAwareViewMixin, ListView):
'''
Generic view to list all weight units
'''
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index 4e0f06529..73a9e2403 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -32,6 +32,7 @@ from django.http import (
from django.template.context_processors import csrf
from django.utils.translation import ugettext_lazy
from django.views.generic import TemplateView
+from django.views.generic.base import View
from django.views.generic.edit import ModelFormMixin
# wger
@@ -41,6 +42,7 @@ from wger.utils.constants import (
HTML_TAG_WHITELIST
)
+from django_user_agents.utils import get_user_agent
logger = logging.getLogger(__name__)
@@ -352,3 +354,14 @@ class WebappManifestView(TemplateView):
resp = super().dispatch(request, args, kwargs)
resp['Content-Type'] = 'application/x-web-app-manifest+json'
return resp
+
+
+class UAAwareViewMixin(View):
+ def get_template_names(self):
+ templates = [self.template_name]
+
+ user_agent = get_user_agent(self.request)
+ if user_agent.is_mobile:
+ templates.insert(0, 'mobile/' + self.template_name)
+
+ return templates