lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Count of files were wrong

Browse Source
This commit is contained in:
Laurent Destailleur 2014-01-26 19:27:42 +01:00
parent cd277aaf12
commit ee41273286
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/company.lib.php
View File

@ -127,7 +127,7 @@ function societe_prepare_head($object)
// Attached files // Attached files
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$upload_dir = $conf->societe->dir_output . "/" . $object->id; $upload_dir = $conf->societe->dir_output . "/" . $object->id;
$nbFiles = count(dol_dir_list($upload_dir)); $nbFiles = count(dol_dir_list($upload_dir,'files'));
$head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Documents"); $head[$h][1] = $langs->trans("Documents");
if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
@ -620,7 +620,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
// Copy to clipboard // Copy to clipboard
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
// Add to agenda // Add to agenda
if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
{ {
@ -725,7 +725,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
if (!empty($object->country)) if (!empty($object->country))
$coords .= "<br />".addslashes($object->country); $coords .= "<br />".addslashes($object->country);
} }
print '<td align="center"><a href="#" onclick="return copyToClipboard(\''.$coords.'\');">'; print '<td align="center"><a href="#" onclick="return copyToClipboard(\''.$coords.'\');">';
print img_picto($langs->trans("Address"), 'object_address.png'); print img_picto($langs->trans("Address"), 'object_address.png');
print '</a></td>'; print '</a></td>';
@ -744,7 +744,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
print img_object($langs->trans("Event"),"action"); print img_object($langs->trans("Event"),"action");
print '</a></td>'; print '</a></td>';
} }
// Edit // Edit
if ($user->rights->societe->contact->creer) if ($user->rights->societe->contact->creer)
{ {

2
htdocs/core/lib/product.lib.php
View File

@ -120,7 +120,7 @@ function product_prepare_head($object, $user)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref); if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref); elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir)); $nbFiles = count(dol_dir_list($upload_dir,'files'));
$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;
$head[$h][1] = $langs->trans('Documents'); $head[$h][1] = $langs->trans('Documents');
if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';