Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Show share button only where appropriate

Roland Geiderd96773051599
diff --git a/wger/core/templates/base.html b/wger/core/templates/base.html
index 9de43c4aa..701eba13b 100644
--- a/wger/core/templates/base.html
+++ b/wger/core/templates/base.html
@@ -1,5 +1,6 @@
{% extends "template.html" %}{% load i18n wger_extras django_bootstrap_breadcrumbs %}
{% block template %}
+{% if show_shariff %}
<div class="modal fade" id="shariffModal">
<div class="modal-dialog">
<div class="modal-content">
@@ -16,6 +17,7 @@
</div>
</div>
</div>
+{% endif %}
{% if trainer_identity %}
@@ -29,6 +31,7 @@ browsing the site as the user "{{current_user}}", all actions are performed on h
</div>
{% endif %}
+{% if show_shariff %}
<button type="button"
class="btn btn-default btn-xs pull-right"
data-toggle="modal"
@@ -37,6 +40,7 @@ browsing the site as the user "{{current_user}}", all actions are performed on h
<span class="glyphicon glyphicon-retweet"></span>
{% trans "Share" %}
</button>
+{% endif %}
<h2 id="page-title" class="page-header">
diff --git a/wger/core/templates/base_features.html b/wger/core/templates/base_features.html
index 57dd6656a..63a800bf2 100644
--- a/wger/core/templates/base_features.html
+++ b/wger/core/templates/base_features.html
@@ -1,7 +1,41 @@
{% extends "template_features.html" %}
+{% load i18n %}
{% block template %}
+
+
<div class="row" style="margin-top: 3em;">
<div class="col-md-10 col-md-offset-1" id="main-content">
+ {% if show_shariff %}
+ <div class="modal fade" id="shariffModal">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <h4 class="modal-title">{% trans "Share this page" %}</h4>
+ </div>
+ <div class="modal-body">
+ <div class="shariff"></div>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <button type="button"
+ class="btn btn-default btn-xs pull-right"
+ data-toggle="modal"
+ data-target="#shariffModal"
+ style="margin-bottom: 1em;">
+ <span class="glyphicon glyphicon-retweet"></span>
+ {% trans "Share" %}
+ </button>
+ <div class="clearfix"></div>
+ {% endif %}
+
+
+
{% if messages and not no_messages %}
{% for message in messages %}
<div class="alert {% if message.tags == 'warning'%}alert-error{% elif message.tags == 'info' %}alert-info{% elif message.tags == 'success' %}alert-success{% endif %}">
diff --git a/wger/core/templates/base_wide.html b/wger/core/templates/base_wide.html
index d75d119d8..8b3d96da8 100644
--- a/wger/core/templates/base_wide.html
+++ b/wger/core/templates/base_wide.html
@@ -1,5 +1,34 @@
-{% extends "template.html" %}
+{% extends "template.html" %}{% load i18n %}
{% block template %}
+{% if show_shariff %}
+<div class="modal fade" id="shariffModal">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <h4 class="modal-title">{% trans "Share this page" %}</h4>
+ </div>
+ <div class="modal-body">
+ <div class="shariff"></div>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
+ </div>
+ </div>
+ </div>
+</div>
+{% endif %}
+
+{% if show_shariff %}
+<button type="button"
+ class="btn btn-default btn-xs pull-right"
+ data-toggle="modal"
+ data-target="#shariffModal"
+ style="margin-top: 0.5em;">
+ <span class="glyphicon glyphicon-retweet"></span>
+ {% trans "Share" %}
+</button>
+{% endif %}
<h2 id="page-title" class="page-header">{% block title %}{% endblock %}</h2>
<div class="row">
<div class="col-md-12" id="main-content">
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index 189be322b..71702e916 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -29,6 +29,26 @@ from wger.utils.cache import get_template_cache_name, cache_mapper
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
+class EquipmentShareButtonTestCase(WorkoutManagerTestCase):
+ '''
+ Test that the share button is correctly displayed and hidden
+ '''
+
+ def test_share_button(self):
+ url = reverse('exercise:equipment:overview')
+
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('admin')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('test')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+
class AddEquipmentTestCase(WorkoutManagerAddTestCase):
'''
Tests adding a new equipment
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index a30b65f5c..1247f2781 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -29,6 +29,27 @@ from wger.utils.cache import get_template_cache_name
from wger.utils.cache import cache_mapper
+class ExerciseShareButtonTestCase(WorkoutManagerTestCase):
+ '''
+ Test that the share button is correctly displayed and hidden
+ '''
+
+ def test_share_button(self):
+ exercise = Exercise.objects.get(pk=1)
+ url = exercise.get_absolute_url()
+
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('admin')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('test')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+
class ExerciseIndexTestCase(WorkoutManagerTestCase):
def exercise_index(self, logged_in=True, demo=False, admin=False):
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index 3fd336523..5043436f7 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -26,6 +26,26 @@ from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.utils.cache import get_template_cache_name
+class MusclesShareButtonTestCase(WorkoutManagerTestCase):
+ '''
+ Test that the share button is correctly displayed and hidden
+ '''
+
+ def test_share_button(self):
+ url = reverse('exercise:muscle:overview')
+
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('admin')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('test')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+
class AddMuscleTestCase(WorkoutManagerAddTestCase):
'''
Tests adding a muscle
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index 0662640cf..74168df0c 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -135,4 +135,5 @@ class EquipmentOverviewView(WgerPermissionMixin, ListView):
for equipment in context['equipment_list']:
equipment.name = _(equipment.name)
context['equipment_list'] = sorted(context['equipment_list'], key=lambda e: e.name)
+ context['show_shariff'] = True
return context
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 86e573f7c..8ba22edc8 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -74,6 +74,14 @@ class ExerciseListView(WgerPermissionMixin, ListView):
.order_by('category__id') \
.select_related()
+ def get_context_data(self, **kwargs):
+ '''
+ Pass additional data to the template
+ '''
+ context = super(ExerciseListView, self).get_context_data(**kwargs)
+ context['show_shariff'] = True
+ return context
+
def view(request, id, slug=None):
'''
@@ -82,6 +90,7 @@ def view(request, id, slug=None):
template_data = {}
template_data['comment_edit'] = False
+ template_data['show_shariff'] = True
# Load the exercise itself
exercise = cache.get(cache_mapper.get_exercise_key(int(id)))
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index 08d330631..8363338a7 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -51,6 +51,7 @@ class MuscleListView(ListView):
'''
context = super(MuscleListView, self).get_context_data(**kwargs)
context['active_languages'] = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)
+ context['show_shariff'] = True
return context
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 1f2f421bc..d9a9a6866 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -33,6 +33,26 @@ from wger.utils.cache import get_template_cache_name, cache_mapper
logger = logging.getLogger('wger.custom')
+class WorkoutLogShareButtonTestCase(WorkoutManagerTestCase):
+ '''
+ Test that the share button is correctly displayed and hidden
+ '''
+
+ def test_share_button(self):
+ url = reverse('manager:log:log', kwargs={'pk': 1})
+
+ response = self.client.get(url)
+ self.assertFalse(response.context['show_shariff'])
+
+ self.user_login('admin')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('test')
+ response = self.client.get(url)
+ self.assertFalse(response.context['show_shariff'])
+
+
class WeightLogAccessTestCase(WorkoutManagerTestCase):
'''
Test accessing the weight log page
@@ -75,6 +95,26 @@ class WeightLogAccessTestCase(WorkoutManagerTestCase):
self.assertEqual(response.status_code, 403)
+class CalendarShareButtonTestCase(WorkoutManagerTestCase):
+ '''
+ Test that the share button is correctly displayed and hidden
+ '''
+
+ def test_share_button(self):
+ url = reverse('manager:workout:calendar', kwargs={'username': 'admin'})
+
+ response = self.client.get(url)
+ self.assertFalse(response.context['show_shariff'])
+
+ self.user_login('admin')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('test')
+ response = self.client.get(url)
+ self.assertFalse(response.context['show_shariff'])
+
+
class CalendarAccessTestCase(WorkoutManagerTestCase):
'''
Test accessing the calendar page
diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.py
index fe69522ee..f0ab695a5 100644
--- a/wger/manager/tests/test_workout.py
+++ b/wger/manager/tests/test_workout.py
@@ -23,6 +23,26 @@ from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+class WorkoutShareButtonTestCase(WorkoutManagerTestCase):
+ '''
+ Test that the share button is correctly displayed and hidden
+ '''
+
+ def test_share_button(self):
+ workout = Workout.objects.get(pk=1)
+
+ response = self.client.get(workout.get_absolute_url())
+ self.assertFalse(response.context['show_shariff'])
+
+ self.user_login('admin')
+ response = self.client.get(workout.get_absolute_url())
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('test')
+ response = self.client.get(workout.get_absolute_url())
+ self.assertFalse(response.context['show_shariff'])
+
+
class WorkoutAccessTestCase(WorkoutManagerTestCase):
'''
Test accessing the workout page
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index c9be94693..2f20836f9 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -267,6 +267,7 @@ class WorkoutLogDetailView(DetailView, WgerPermissionMixin):
# Call the base implementation first to get a context
context = super(WorkoutLogDetailView, self).get_context_data(**kwargs)
+ is_owner = self.owner_user == self.request.user
# Prepare the entries for rendering and the D3 chart
workout_log = {}
@@ -295,7 +296,8 @@ class WorkoutLogDetailView(DetailView, WgerPermissionMixin):
context['workout_log'] = workout_log
context['reps'] = _("Reps")
context['owner_user'] = self.owner_user
- context['is_owner'] = self.owner_user == self.request.user
+ context['is_owner'] = is_owner
+ context['show_shariff'] = is_owner and self.owner_user.userprofile.ro_access
return context
@@ -421,4 +423,5 @@ def calendar(request, username=None, year=None, month=None):
context['is_owner'] = is_owner
context['impressions'] = WorkoutSession.IMPRESSION
context['month_list'] = WorkoutLog.objects.filter(user=user).dates('date', 'month')
+ context['show_shariff'] = is_owner and user.userprofile.ro_access
return render(request, 'workout/calendar.html', context)
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 2156cbab8..f1b9b78a9 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -102,6 +102,7 @@ def view(request, pk):
template_data['uid'] = uid
template_data['token'] = token
template_data['is_owner'] = is_owner
+ template_data['show_shariff'] = is_owner and user.userprofile.ro_access
return render(request, 'workout/view.html', template_data)
diff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.py
index 461417c42..825aec232 100644
--- a/wger/nutrition/tests/test_plan.py
+++ b/wger/nutrition/tests/test_plan.py
@@ -22,6 +22,27 @@ from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerTestCase
+class PlanShareButtonTestCase(WorkoutManagerTestCase):
+ '''
+ Test that the share button is correctly displayed and hidden
+ '''
+
+ def test_share_button(self):
+ plan = NutritionPlan.objects.get(pk=5)
+ url = plan.get_absolute_url()
+
+ response = self.client.get(url)
+ self.assertFalse(response.context['show_shariff'])
+
+ self.user_login('admin')
+ response = self.client.get(url)
+ self.assertTrue(response.context['show_shariff'])
+
+ self.user_login('test')
+ response = self.client.get(url)
+ self.assertFalse(response.context['show_shariff'])
+
+
class PlanAccessTestCase(WorkoutManagerTestCase):
'''
Test accessing the workout page
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 18fa90f43..84eeda671 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -70,6 +70,14 @@ class IngredientListView(ListView):
.filter(status__in=Ingredient.INGREDIENT_STATUS_OK)
.only('id', 'name'))
+ def get_context_data(self, **kwargs):
+ '''
+ Pass additional data to the template
+ '''
+ context = super(IngredientListView, self).get_context_data(**kwargs)
+ context['show_shariff'] = True
+ return context
+
def view(request, id, slug=None):
template_data = {}
@@ -82,6 +90,7 @@ def view(request, id, slug=None):
template_data['form'] = UnitChooserForm(data={'ingredient_id': ingredient.id,
'amount': 100,
'unit': None})
+ template_data['show_shariff'] = True
return render(request, 'ingredient/view.html', template_data)
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 2ee7b2737..732b678f6 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -149,6 +149,7 @@ def view(request, id):
template_data['token'] = token
template_data['owner_user'] = user
template_data['is_owner'] = is_owner
+ template_data['show_shariff'] = is_owner and user.userprofile.ro_access
return render(request, 'plan/view.html', template_data)
diff --git a/wger/utils/context_processor.py b/wger/utils/context_processor.py
index 4fe85ac3e..ccf560eed 100644
--- a/wger/utils/context_processor.py
+++ b/wger/utils/context_processor.py
@@ -66,6 +66,7 @@ def processor(request):
or '/contact' in request.get_full_path() \
or '/api/v2' in request.get_full_path():
context['active_tab'] = constants.SOFTWARE_TAB
+ context['show_shariff'] = True
elif '/exercise/' in request.get_full_path():
context['active_tab'] = constants.EXERCISE_TAB
diff --git a/wger/weight/views.py b/wger/weight/views.py
index 4b026b5cb..d56516593 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -142,6 +142,7 @@ def overview(request, username=None):
template_data['is_owner'] = is_owner
template_data['owner_user'] = user
+ template_data['show_shariff'] = is_owner and user.userprofile.ro_access
return render(request, 'weight_overview.html', template_data)