Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use the username instead of a UID

Roland Geiderf69d8c7fb485
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 9069f4fb6..d78996e9c 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -37,7 +37,7 @@
data-toggle="dropdown">{% trans "Workouts" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{% url 'manager:workout:overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>
- <li><a href="{% url 'manager:workout:calendar' %}" rel="nofollow">{% trans "Calendar" %}</a></li>
+ <li><a href="{% url 'manager:workout:calendar' user.username %}" rel="nofollow">{% trans "Calendar" %}</a></li>
<li><a href="{% url 'manager:schedule:overview' %}" rel="nofollow">{% trans "Workouts schedules" %}</a></li>
</ul>
</li>
diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.html
index 03e0346ec..e6f184425 100644
--- a/wger/manager/templates/workout/calendar.html
+++ b/wger/manager/templates/workout/calendar.html
@@ -168,7 +168,7 @@ you can click on them to see the details.{% endblocktrans %}</p>
<h3>{% trans 'Log' %}</h3>
<p>
- <a href="{% url 'manager:workout:calendar' uid %}">
+ <a href="{% url 'manager:workout:calendar' owner_user %}">
<img src="{% static 'images/icons/calendar.svg' %}"
width="32"
height="32"
@@ -195,7 +195,7 @@ you can click on them to see the details.{% endblocktrans %}</p>
{% if current_month = date.month and current_year = date.year %}
<span>{{date|date:"F"}}</span><br>
{% else %}
- <span><a href="{% url 'manager:workout:calendar' uid date.year date.month %}">{{date|date:"F"}}</a></span><br>
+ <span><a href="{% url 'manager:workout:calendar' owner_user date.year date.month %}">{{date|date:"F"}}</a></span><br>
{% endif %}
{% endfor %}
</div>
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 1d59689e9..971a4aa90 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -28,7 +28,6 @@ from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.utils.cache import get_template_cache_name, cache_mapper
-from wger.utils.helpers import make_uid
logger = logging.getLogger('wger.custom')
@@ -85,7 +84,7 @@ class CalendarAccessTestCase(WorkoutManagerTestCase):
'''
Test accessing the URL of a shared calendar page
'''
- url = reverse('manager:workout:calendar', kwargs={'uidb64': make_uid(1)})
+ url = reverse('manager:workout:calendar', kwargs={'username': 'admin'})
self.user_login('admin')
response = self.client.get(url)
@@ -103,7 +102,7 @@ class CalendarAccessTestCase(WorkoutManagerTestCase):
'''
Test accessing the URL of a unshared calendar page
'''
- url = reverse('manager:workout:calendar', kwargs={'uidb64': make_uid(2)})
+ url = reverse('manager:workout:calendar', kwargs={'username': 'test'})
self.user_login('admin')
response = self.client.get(url)
@@ -358,7 +357,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):
for cache_key in ('workout-log-full', 'workout-log-mobile'):
self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
self.assertFalse(cache.get(get_template_cache_name(cache_key, False, 1, 2012, 10)))
- self.client.get(reverse('manager:workout:calendar', kwargs={'uidb64': make_uid(1),
+ self.client.get(reverse('manager:workout:calendar', kwargs={'username': 'admin',
'year': 2012,
'month': 10}))
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 4d5408441..5298343c1 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -65,13 +65,13 @@ patterns_workout = patterns('',
url(r'^(?P<pk>\d+)/view/$',
workout.view,
name='view'),
- url(r'^calendar/(?P<uidb64>[0-9A-Za-z_\-]+)$',
+ url(r'^calendar/(?P<username>[\w.@+-]+)$',
log.calendar,
name='calendar'),
url(r'^calendar$',
log.calendar,
name='calendar'),
- url(r'^calendar/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})$',
+ url(r'^calendar/(?P<username>[\w.@+-]+)/(?P<year>\d{4})/(?P<month>\d{1,2})$',
log.calendar,
name='calendar'),
url(r'^calendar/(?P<year>\d{4})/(?P<month>\d{1,2})$',
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 89fbcc320..4f0b84f15 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -378,12 +378,12 @@ class WorkoutCalendar(HTMLCalendar):
return '<td class="{0}" style="vertical-align: middle;">{1}</td>'.format(cssclass, body)
-def calendar(request, uidb64=None, year=None, month=None):
+def calendar(request, username=None, year=None, month=None):
'''
Show a calendar with all the workout logs
'''
try:
- is_owner, user = check_access(request.user, uidb64)
+ is_owner, user = check_access(request.user, username)
except TypeError as e:
# logger.debug("Type error while checking for access: {0}".format(e))
return HttpResponseForbidden()
diff --git a/wger/utils/helpers.py b/wger/utils/helpers.py
index 685d7cf0a..4a1b72466 100644
--- a/wger/utils/helpers.py
+++ b/wger/utils/helpers.py
@@ -136,25 +136,19 @@ def password_generator(length=15):
return ''.join(random.choice(chars) for i in range(length))
-def check_access(request_user, uidb64=None):
+def check_access(request_user, username=None):
'''
Small helper function to check that the current (possibly unauthenticated)
user can access a URL that the owner user shared the link.
:param request_user: the user in the current request
- :param user_pk: the user_pk parameter given to the view (if any)
+ :param username: the username
:return: returns False if unauthorized or a tuple otherwise (is_owner, user)
'''
- if uidb64:
- try:
- user_pk = int(urlsafe_base64_decode(uidb64))
- except ValueError as e:
- logger.debug("Error while calculating UID: {0}".format(e))
- return False
-
- user = get_object_or_404(User, pk=user_pk)
- if request_user.pk == user_pk:
+ if username:
+ user = get_object_or_404(User, username=username)
+ if request_user.username == username:
user = request_user
elif not user.userprofile.ro_access:
return False