Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move list of users to partial template

Roland Geider2620e7118e59
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 0f6694ab2..bd473f133 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -31,38 +31,7 @@ $(document).ready( function () {
{% block content %}
{% if perms.gym.manage_gym or perms.gym.gym_trainer %}
-<table class="table table-hover" id="main_member_list">
-<thead>
-<tr>
- <th style="width: 10%;">{% trans "ID" %}</th>
- <th style="width: 40%;">{% trans "Username" %}</th>
- <th>{% trans "Name" %}</th>
- <th>{% trans "Last activity" %}</th>
-</tr>
-</thead>
-<tbody>
-{% for current_user in object_list.members %}
-<tr>
- <td>
- {{current_user.obj.pk}}
- </td>
- <td>
- <a href="{% url 'core:user:overview' current_user.obj.pk %}">{{current_user.obj}}</a>
- </td>
- <td>
- {{current_user.obj.get_full_name}}
- </td>
- <td data-order="{{current_user.last_log|date:'U'}}">
- {{current_user.last_log|default:'-/-'}}
- </td>
-</tr>
-{% empty %}
-<tr>
- <td colspan="4">{% trans "Nothing found" %}</td>
-</tr>
-{% endfor %}
-</tbody>
-</table>
+ {% include 'gym/partial_user_list.html' %}
{% endif %}
diff --git a/wger/gym/templates/gym/partial_user_list.html b/wger/gym/templates/gym/partial_user_list.html
new file mode 100644
index 000000000..1adb8ae60
--- /dev/null
+++ b/wger/gym/templates/gym/partial_user_list.html
@@ -0,0 +1,32 @@
+{% load i18n %}
+<table class="table table-hover" id="main_member_list">
+<thead>
+<tr>
+ {% for key in user_table.keys %}
+ <th>{{ key }}</th>
+ {% endfor %}
+</tr>
+</thead>
+<tbody>
+{% for current_user in user_table.users %}
+<tr>
+ <td>
+ {{current_user.obj.pk}}
+ </td>
+ <td>
+ <a href="{% url 'core:user:overview' current_user.obj.pk %}">{{current_user.obj}}</a>
+ </td>
+ <td>
+ {{current_user.obj.get_full_name}}
+ </td>
+ <td data-order="{{current_user.last_log|date:'U'}}">
+ {{current_user.last_log|default:'-/-'}}
+ </td>
+</tr>
+{% empty %}
+<tr>
+ <td colspan="4">{% trans "Nothing found" %}</td>
+</tr>
+{% endfor %}
+</tbody>
+</table>
\ No newline at end of file
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 384d81f42..887c6cb26 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -126,6 +126,8 @@ class GymUserListView(WgerPermissionMixin, ListView):
context['gym'] = Gym.objects.get(pk=self.kwargs['pk'])
context['admin_count'] = len(context['object_list']['admins'])
context['user_count'] = len(context['object_list']['members'])
+ context['user_table'] = {'keys': [_('ID'), _('Username'), _('Name'), _('Last activity')],
+ 'users': context['object_list']['members']}
return context