From 26f638251d65530348e4aea33ca4fc262dc7c828 Mon Sep 17 00:00:00 2001 From: Nanoy Date: Mon, 14 Jan 2019 02:43:47 +0100 Subject: [PATCH] Ajout de liens pour les profils users et produits --- gestion/templates/gestion/menus_list.html | 2 +- gestion/templates/gestion/pintes_user_list.html | 2 +- gestion/templates/gestion/products_list.html | 2 +- gestion/templates/gestion/ranking.html | 4 ++-- users/templates/users/admins_index.html | 2 +- users/templates/users/allReloads.html | 2 +- users/templates/users/all_consumptions.html | 4 ++-- users/templates/users/all_menus.html | 2 +- users/templates/users/group_profile.html | 2 +- users/templates/users/profile.html | 2 +- users/templates/users/superusers_index.html | 2 +- users/templates/users/users_index.html | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gestion/templates/gestion/menus_list.html b/gestion/templates/gestion/menus_list.html index 230e719..3cecb99 100644 --- a/gestion/templates/gestion/menus_list.html +++ b/gestion/templates/gestion/menus_list.html @@ -29,7 +29,7 @@ {{ menu.name }} {{ menu.amount}} € {{ menu.barcode }} - {% for art in menu.articles.all %}{{art}},{% endfor %} + {% for art in menu.articles.all %}{{art}},{% endfor %} {{ menu.is_active | yesno:"Oui, Non"}} {% if perms.gestion.change_menu %}{% if menu.is_active %}Désa{% else %}A{% endif %}ctiver Modifier{% endif %} diff --git a/gestion/templates/gestion/pintes_user_list.html b/gestion/templates/gestion/pintes_user_list.html index d7de296..a827972 100644 --- a/gestion/templates/gestion/pintes_user_list.html +++ b/gestion/templates/gestion/pintes_user_list.html @@ -22,7 +22,7 @@ {% for user in users %} - {{ user }} + {{user}} Profil {{ user.pintes_owned_currently.count }} diff --git a/gestion/templates/gestion/products_list.html b/gestion/templates/gestion/products_list.html index eda88c4..ce840fd 100644 --- a/gestion/templates/gestion/products_list.html +++ b/gestion/templates/gestion/products_list.html @@ -32,7 +32,7 @@ {% for product in products %} - {{ product.name }} + {{ product.name }} {{ product.amount}} {{ product.stockHold }} {{ product.stockBar }} diff --git a/gestion/templates/gestion/ranking.html b/gestion/templates/gestion/ranking.html index 95c5a0d..204fc50 100644 --- a/gestion/templates/gestion/ranking.html +++ b/gestion/templates/gestion/ranking.html @@ -28,7 +28,7 @@ {%for customer in bestBuyers%} {{ forloop.counter }} - {{ customer.username }} + {{ customer.username }} {{ customer.profile.debit }}€ {%endfor%} @@ -59,7 +59,7 @@ {% for customer in bestDrinkers %} {{ forloop.counter }} - {{ customer.0.username }} + {{ customer.0.username }} {{ customer.1 }} {%endfor%} diff --git a/users/templates/users/admins_index.html b/users/templates/users/admins_index.html index 8dacf18..8c1e04c 100644 --- a/users/templates/users/admins_index.html +++ b/users/templates/users/admins_index.html @@ -23,7 +23,7 @@ {% for user in admins %} - {{ user }} {% if user.is_superuser %}(superuser){% endif %} + {{ user }}{ {% if user.is_superuser %}(superuser){% endif %} Profil {% if not user.is_superuser %}Retirer des admins{% endif %} diff --git a/users/templates/users/allReloads.html b/users/templates/users/allReloads.html index e06fe90..6731132 100644 --- a/users/templates/users/allReloads.html +++ b/users/templates/users/allReloads.html @@ -4,7 +4,7 @@ {% block navbar %} {% endblock %} {% block content %} diff --git a/users/templates/users/all_consumptions.html b/users/templates/users/all_consumptions.html index 02729bd..985963c 100644 --- a/users/templates/users/all_consumptions.html +++ b/users/templates/users/all_consumptions.html @@ -10,7 +10,7 @@ {% block content %}
-

Consommations ({{user}})

+

Consommations ({{user}})

@@ -28,7 +28,7 @@ {% for c in consumptions %} - {{c.product}} + {% if perms.gestion.view_product %}{{ c.product.name }}{% else %}{{c.product.name}}{% endif %} {{c.quantity}} {{c.amount}} {{c.paymentMethod}} diff --git a/users/templates/users/all_menus.html b/users/templates/users/all_menus.html index 0e3921d..b412d90 100644 --- a/users/templates/users/all_menus.html +++ b/users/templates/users/all_menus.html @@ -10,7 +10,7 @@ {% block content %}
-

Consommations de menus ({{user}})

+

Consommations de menus ({{user}})

diff --git a/users/templates/users/group_profile.html b/users/templates/users/group_profile.html index 3d5ebf0..17f89cc 100644 --- a/users/templates/users/group_profile.html +++ b/users/templates/users/group_profile.html @@ -72,7 +72,7 @@ {% for user in group.user_set.all %} - {{ user }} + {{user}} Profil Retirer diff --git a/users/templates/users/profile.html b/users/templates/users/profile.html index caea4fd..778dac2 100644 --- a/users/templates/users/profile.html +++ b/users/templates/users/profile.html @@ -124,7 +124,7 @@ {% for c in lastConsumptions %} - {{c.product}} + {% if perms.gestion.view_product %}{{ c.product.name }}{% else %}{{c.product}}{% endif %} {{c.quantity}} {{c.amount}} € {{c.paymentMethod}} diff --git a/users/templates/users/superusers_index.html b/users/templates/users/superusers_index.html index 157aebf..9c4a5ff 100644 --- a/users/templates/users/superusers_index.html +++ b/users/templates/users/superusers_index.html @@ -23,7 +23,7 @@ {% for user in superusers %} - {{ user }} + {{user}} Profil Retirer des superusers diff --git a/users/templates/users/users_index.html b/users/templates/users/users_index.html index 7cc5545..7bc806d 100644 --- a/users/templates/users/users_index.html +++ b/users/templates/users/users_index.html @@ -25,7 +25,7 @@ {% for user in users %} - {{ user }} + {{user}} Profil {% if perms.auth.change_user %} {{ user.is_active | yesno:"Désa,A"}}ctiver