diff --git a/categories/delete_category.html b/categories/delete_category.html index 7430344..203bb60 100644 --- a/categories/delete_category.html +++ b/categories/delete_category.html @@ -7,7 +7,7 @@ {{#form on="delete"}} {{* Vérifier s'il reste des matériels dans cette catégorie *}} - {{#load type="equipment" category=$_GET.key limit="1"}} + {{#load type="equipment" category=$_GET.key assign="equipment"}} {{:redirect force="./index.html?err=1&msg=suppression"}} {{else}} {{* supprimer la catégorie sélectionnée*}} diff --git a/categories/index.html b/categories/index.html index 0eb43d0..aac2a00 100644 --- a/categories/index.html +++ b/categories/index.html @@ -27,17 +27,15 @@ {{:assign category_key=$key}} {{* voir s'il y a des matériels dans cette catégorie *}} {{:assign materiel_present=true}} - {{#load type="equipment" where="$$.category = :category_key" :category_key=$category_key limit=1}} + {{#load type="equipment" where="$$.category = :category_key" :category_key=$category_key}} {{else}} {{:assign materiel_present=false}} {{/load}} {{$name}} - {{if ! $materiel_present}} - {{:linkbutton label="Supprimer" href="delete_category.html?key=%s"|args:$key shape="delete" target="_dialog"}} - {{/if}} {{:linkbutton label="Modifier" href="modify_category.html?key=%s"|args:$key shape="edit" target="_dialog"}} + {{:linkbutton label="Supprimer" href="delete_category.html?key=%s"|args:$key shape="delete" target="_dialog"}} {{else}} diff --git a/equipment_history.html b/equipment_history.html index 3ce6424..ecf5a97 100644 --- a/equipment_history.html +++ b/equipment_history.html @@ -193,7 +193,7 @@ {{$date|date_short}} {{$col2}} - {{$op_label}} + {{$op_label}} {{$amount}} {{$stock}} {{$exterieur}} @@ -291,7 +291,7 @@ {{$date|date_short}} {{$col2}} - {{$op_label}} + {{$op_label}} {{$amount}} {{$stock}} {{$col6}} diff --git a/style.css b/style.css index 39ae075..2193b11 100644 --- a/style.css +++ b/style.css @@ -21,6 +21,6 @@ } /* désactiver rétroaction pour colonnes non triables */ -table.list > thead th[class~=nosort] a:hover { +table.list > thead td[class~=nosort] a:hover { background-color : rgba(var(--gSecondColor), 0.); }