Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add general user list
Roland Geiderce53f229bf22
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex 0b9ad0506..8c7381e19 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -207,6 +207,7 @@<li><a href="{% url 'core:license:list' %}">{% trans "Licenses" %} </a></li>{% endif %}{% if perms.gym.manage_gyms %}+ <li><a href="{% url 'core:user:list' %}">{% trans "User list" %} </a></li><li><a href="{% url 'gym:gym:list' %}">{% trans "Gyms" %} </a></li>{% endif %}diff --git a/wger/core/templates/user/list.html b/wger/core/templates/user/list.htmlnew file mode 100644index 000000000..7793507b7--- /dev/null+++ b/wger/core/templates/user/list.html@@ -0,0 +1,14 @@+{% extends "base.html" %}+{% load i18n staticfiles wger_extras django_bootstrap_breadcrumbs %}++{% block title %}{% trans "User list" %}{% endblock %}+++{% block content %}+ {% include 'gym/partial_user_list.html' %}+{% endblock %}+++{% block sidebar %}++{% endblock %}diff --git a/wger/core/urls.py b/wger/core/urls.pyindex 8f62edb6b..589936496 100644--- a/wger/core/urls.py+++ b/wger/core/urls.py@@ -30,7 +30,7 @@ from wger.core.views import (license)-# sub patterns for languages+# sub patterns for userpatterns_user = [url(r'^login$',user.login,@@ -71,6 +71,9 @@ patterns_user = [url(r'^(?P<pk>\d+)/overview',user.UserDetailView.as_view(),name='overview'),+ url(r'^list',+ user.UserListView.as_view(),+ name='list'),# Password reset is implemented by Django, no need to cook our own soup here# (besides the templates)diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 3b759c1fc..e3afade9d 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -32,7 +32,8 @@ from django.contrib import messagesfrom django.views.generic import (RedirectView,UpdateView,- DetailView+ DetailView,+ ListView)from django.conf import settingsfrom rest_framework.authtoken.models import Token@@ -451,3 +452,34 @@ class UserDetailView(WgerPermissionMixin, DetailView):context['admin_notes'] = AdminUserNote.objects.filter(member=self.object)[:5]context['contracts'] = Contract.objects.filter(member=self.object)[:5]return context+++class UserListView(WgerPermissionMixin, ListView):+ '''+ Overview of all users in the instance+ '''+ model = User+ permission_required = ('gym.manage_gyms')+ template_name = 'user/list.html'++ def get_queryset(self):+ '''+ Return a list with the users, not really a queryset.+ '''+ out = {'admins': [],+ 'members': []}++ for u in User.objects.select_related('usercache').all():+ out['members'].append({'obj': u,+ 'last_log': u.usercache.last_activity})++ return out++ def get_context_data(self, **kwargs):+ '''+ Pass other info to the template+ '''+ context = super(UserListView, self).get_context_data(**kwargs)+ context['user_table'] = {'keys': [_('ID'), _('Username'), _('Name'), _('Last activity')],+ 'users': context['object_list']['members']}+ return contextdiff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.htmlindex bd473f133..eea9f0f29 100644--- a/wger/gym/templates/gym/member_list.html+++ b/wger/gym/templates/gym/member_list.html@@ -13,22 +13,6 @@{% endblock %}-{% block header %}-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/datatables/media/css/dataTables.bootstrap.min.css' %}">-<script src="{% static 'bower_components/datatables/media/js/jquery.dataTables.min.js' %}" ></script>-<script src="{% static 'bower_components/datatables/media/js/dataTables.bootstrap.min.js' %}" ></script>-<script>-$(document).ready( function () {- /* Make table sortable */- $('#main_member_list').DataTable({- paging: false,- bFilter: true,- bInfo : false- });-});-</script>-{% endblock %}-{% block content %}{% if perms.gym.manage_gym or perms.gym.gym_trainer %}{% include 'gym/partial_user_list.html' %}diff --git a/wger/gym/templates/gym/partial_user_list.html b/wger/gym/templates/gym/partial_user_list.htmlindex 1adb8ae60..e01b0384d 100644--- a/wger/gym/templates/gym/partial_user_list.html+++ b/wger/gym/templates/gym/partial_user_list.html@@ -1,4 +1,19 @@-{% load i18n %}+{% load i18n staticfiles %}++<link rel="stylesheet" type="text/css" href="{% static 'bower_components/datatables/media/css/dataTables.bootstrap.min.css' %}">+<script src="{% static 'bower_components/datatables/media/js/jquery.dataTables.min.js' %}" ></script>+<script src="{% static 'bower_components/datatables/media/js/dataTables.bootstrap.min.js' %}" ></script>+<script>+$(document).ready( function () {+ /* Make table sortable */+ $('#main_member_list').DataTable({+ paging: false,+ bFilter: true,+ bInfo : false+ });+});+</script>+<table class="table table-hover" id="main_member_list"><thead><tr>