From 94aa116fa8009c3ffa38dc78db50428a9c4e73dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 26 Feb 2021 23:01:18 +0100 Subject: [PATCH 1/2] fix variable name --- htdocs/core/lib/project.lib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 1222fa120fe..a5798e6e473 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -47,7 +47,7 @@ function project_prepare_head(Project $project) $nbContacts = 0; // Enable caching of project count Contacts require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; - $cachekey = 'count_contacts_project_'.$object->id; + $cachekey = 'count_contacts_project_'.$project->id; $dataretrieved = dol_getcache($cachekey); if (!is_null($dataretrieved)) { @@ -69,7 +69,7 @@ function project_prepare_head(Project $project) $nbTasks = 0; // Enable caching of project count Tasks require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; - $cachekey = 'count_tasks_project_'.$object->id; + $cachekey = 'count_tasks_project_'.$project->id; $dataretrieved = dol_getcache($cachekey); if (!is_null($dataretrieved)) { @@ -90,7 +90,7 @@ function project_prepare_head(Project $project) $nbTimeSpent = 0; // Enable caching of project count Timespent - $cachekey = 'count_timespent_project_'.$object->id; + $cachekey = 'count_timespent_project_'.$project->id; $dataretrieved = dol_getcache($cachekey); if (!is_null($dataretrieved)) { $nbTimeSpent = $dataretrieved; @@ -128,7 +128,7 @@ function project_prepare_head(Project $project) || !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled)) { $nbElements = 0; // Enable caching of thirdrparty count Contacts - $cachekey = 'count_elements_project_'.$object->id; + $cachekey = 'count_elements_project_'.$project->id; $dataretrieved = dol_getcache($cachekey); if (!is_null($dataretrieved)) { $nbElements = $dataretrieved; @@ -244,7 +244,7 @@ function project_prepare_head(Project $project) $totalAttached = 0; // Enable caching of thirdrparty count attached files and links require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; - $cachekey = 'count_attached_project_'.$object->id; + $cachekey = 'count_attached_project_'.$project->id; $dataretrieved = dol_getcache($cachekey); if (!is_null($dataretrieved)) { $totalAttached = $dataretrieved; @@ -270,7 +270,7 @@ function project_prepare_head(Project $project) $nbComments = 0; // Enable caching of thirdrparty count attached files and links require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; - $cachekey = 'count_attached_project_'.$object->id; + $cachekey = 'count_attached_project_'.$project->id; $dataretrieved = dol_getcache($cachekey); if (!is_null($dataretrieved)) { $nbComments = $dataretrieved; From 5d4004d3f4fe3668ef2c23d4d8bc46ac23f98a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 26 Feb 2021 23:06:33 +0100 Subject: [PATCH 2/2] fix cache --- htdocs/core/lib/project.lib.php | 43 +++++++++++++++++---------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index a5798e6e473..01c7d0e2d81 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -54,7 +54,7 @@ function project_prepare_head(Project $project) $nbContacts = $dataretrieved; } else { $nbContacts = count($project->liste_contact(-1, 'internal')) + count($project->liste_contact(-1, 'external')); - dol_setcache($cachekey, $nbContact, 120); // If setting cache fails, this is not a problem, so we do not test result. + dol_setcache($cachekey, $nbContacts, 120); // If setting cache fails, this is not a problem, so we do not test result. } $head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$project->id; $head[$h][1] = $langs->trans("ProjectContact"); @@ -134,65 +134,66 @@ function project_prepare_head(Project $project) $nbElements = $dataretrieved; } else { if (!empty($conf->propal->enabled)) { - $count += $project->getElementCount('propal', 'propal'); + $nbElements += $project->getElementCount('propal', 'propal'); } if (!empty($conf->commande->enabled)) { - $count += $project->getElementCount('order', 'commande'); + $nbElements += $project->getElementCount('order', 'commande'); } if (!empty($conf->facture->enabled)) { - $count += $project->getElementCount('invoice', 'facture'); + $nbElements += $project->getElementCount('invoice', 'facture'); } if (!empty($conf->facture->enabled)) { - $count += $project->getElementCount('invoice_predefined', 'facture_rec'); + $nbElements += $project->getElementCount('invoice_predefined', 'facture_rec'); } if (!empty($conf->supplier_proposal->enabled)) { - $count += $project->getElementCount('proposal_supplier', 'supplier_proposal'); + $nbElements += $project->getElementCount('proposal_supplier', 'supplier_proposal'); } if (!empty($conf->supplier_order->enabled)) { - $count += $project->getElementCount('order_supplier', 'commande_fournisseur'); + $nbElements += $project->getElementCount('order_supplier', 'commande_fournisseur'); } if (!empty($conf->supplier_invoice->enabled)) { - $count += $project->getElementCount('invoice_supplier', 'facture_fourn'); + $nbElements += $project->getElementCount('invoice_supplier', 'facture_fourn'); } if (!empty($conf->contrat->enabled)) { - $count += $project->getElementCount('contract', 'contrat'); + $nbElements += $project->getElementCount('contract', 'contrat'); } if (!empty($conf->ficheinter->enabled)) { - $count += $project->getElementCount('intervention', 'fichinter'); + $nbElements += $project->getElementCount('intervention', 'fichinter'); } if (!empty($conf->expedition->enabled)) { - $count += $project->getElementCount('shipping', 'expedition'); + $nbElements += $project->getElementCount('shipping', 'expedition'); } if (!empty($conf->mrp->enabled)) { - $count += $project->getElementCount('mrp', 'mrp_mo', 'fk_project'); + $nbElements += $project->getElementCount('mrp', 'mrp_mo', 'fk_project'); } if (!empty($conf->deplacement->enabled)) { - $count += $project->getElementCount('trip', 'deplacement'); + $nbElements += $project->getElementCount('trip', 'deplacement'); } if (!empty($conf->expensereport->enabled)) { - $count += $project->getElementCount('expensereport', 'expensereport'); + $nbElements += $project->getElementCount('expensereport', 'expensereport'); } if (!empty($conf->don->enabled)) { - $count += $project->getElementCount('donation', 'don'); + $nbElements += $project->getElementCount('donation', 'don'); } if (!empty($conf->loan->enabled)) { - $count += $project->getElementCount('loan', 'loan'); + $nbElements += $project->getElementCount('loan', 'loan'); } if (!empty($conf->tax->enabled)) { - $count += $project->getElementCount('chargesociales', 'chargesociales'); + $nbElements += $project->getElementCount('chargesociales', 'chargesociales'); } if (!empty($conf->projet->enabled)) { - $count += $project->getElementCount('project_task', 'projet_task'); + $nbElements += $project->getElementCount('project_task', 'projet_task'); } if (!empty($conf->stock->enabled)) { - $count += $project->getElementCount('stock_mouvement', 'stock'); + $nbElements += $project->getElementCount('stock_mouvement', 'stock'); } if (!empty($conf->salaries->enabled)) { - $count += $project->getElementCount('salaries', 'payment_salary'); + $nbElements += $project->getElementCount('salaries', 'payment_salary'); } if (!empty($conf->banque->enabled)) { - $count += $project->getElementCount('variouspayment', 'payment_various'); + $nbElements += $project->getElementCount('variouspayment', 'payment_various'); } + dol_setcache($cachekey, $nbElements, 120); // If setting cache fails, this is not a problem, so we do not test result. } $head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$project->id; $head[$h][1] = $langs->trans("ProjectOverview");