Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

add badges

Browse Source
This commit is contained in:
Frédéric France
2022-09-15 20:23:37 +02:00
parent 16d2f06684
commit 567c646989
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/agenda.lib.php
View File

@@ -20,8 +20,8 @@
*/ */
/** /**
* \file htdocs/core/lib/agenda.lib.php * \file htdocs/core/lib/agenda.lib.php
* \brief Set of function for the agenda module * \brief Set of function for the agenda module
*/ */
@@ -314,7 +314,7 @@ function show_array_last_actions_done($max = 5)
print '<tr class="oddeven">'; print '<tr class="oddeven">';
$staticaction->type_code = $obj->code; $staticaction->type_code = $obj->code;
$staticaction->libelle = $obj->label; $staticaction->label = $obj->label;
$staticaction->id = $obj->id; $staticaction->id = $obj->id;
print '<td>'.$staticaction->getNomUrl(1, 34).'</td>'; print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';

15
htdocs/core/lib/asset.lib.php
View File

@@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2018-2022 OpenDSI <support@open-dsi.fr> /* Copyright (C) 2018-2022 OpenDSI <support@open-dsi.fr>
* Copyright (C) 2022 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -28,7 +29,11 @@
*/ */
function assetAdminPrepareHead() function assetAdminPrepareHead()
{ {
global $langs, $conf; global $langs, $conf, $db;
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label('asset');
$extrafields->fetch_name_optionals_label('assetmodel');
$langs->load("assets"); $langs->load("assets");
@@ -52,11 +57,19 @@ function assetAdminPrepareHead()
$head[$h][0] = DOL_URL_ROOT.'/asset/admin/asset_extrafields.php'; $head[$h][0] = DOL_URL_ROOT.'/asset/admin/asset_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields"); $head[$h][1] = $langs->trans("ExtraFields");
$nbExtrafields = is_countable($extrafields->attributes['asset']['label']) ? count($extrafields->attributes['asset']['label']) : 0;
if ($nbExtrafields > 0) {
$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
}
$head[$h][2] = 'asset_extrafields'; $head[$h][2] = 'asset_extrafields';
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assetmodel_extrafields.php'; $head[$h][0] = DOL_URL_ROOT.'/asset/admin/assetmodel_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsAssetModel"); $head[$h][1] = $langs->trans("ExtraFieldsAssetModel");
$nbExtrafields = is_countable($extrafields->attributes['assetmodel']['label']) ? count($extrafields->attributes['assetmodel']['label']) : 0;
if ($nbExtrafields > 0) {
$head[$h][1] .= ' <span class="badge">'.$nbExtrafields.'</span>';
}
$head[$h][2] = 'assetmodel_extrafields'; $head[$h][2] = 'assetmodel_extrafields';
$h++; $h++;