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

on goung

Browse Source
This commit is contained in:
Florian HENRY 2020-12-23 23:44:38 +01:00
parent 26d3ea2227
commit 055a2b6fec
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/list.php
View File

@ -267,7 +267,7 @@ if (empty($reshook))
$search_categ_thirdparty = ''; $search_categ_thirdparty = '';
$search_categ_supplier = ''; $search_categ_supplier = '';
$search_import_key = ''; $search_import_key = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$search_roles = array(); $search_roles = array();
} }

5
htdocs/core/actions_massactions.inc.php
View File

@ -1308,7 +1308,6 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
$to_affecttag_type_array=array(); $to_affecttag_type_array=array();
$categ_type_array=$categ->getMapList(); $categ_type_array=$categ->getMapList();
foreach($categ_type_array as $categdef) { foreach($categ_type_array as $categdef) {
if (in_array($categdef['code'], $affecttag_type_array)) { if (in_array($categdef['code'], $affecttag_type_array)) {
$to_affecttag_type_array[] = $categdef['code']; $to_affecttag_type_array[] = $categdef['code'];
} }
@ -1319,10 +1318,10 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
if (!empty($to_affecttag_type_array)) { if (!empty($to_affecttag_type_array)) {
foreach ($to_affecttag_type_array as $categ_type) { foreach ($to_affecttag_type_array as $categ_type) {
$contcats = GETPOST('contcats_' . $categ_type, 'array'); $contcats = GETPOST('contcats_' . $categ_type, 'array');
var_dump($toselect);exit; //var_dump($toselect);exit;
foreach ($toselect as $toselectid) { foreach ($toselect as $toselectid) {
$result = $object->fetch($toselectid); $result = $object->fetch($toselectid);
var_dump($contcats);exit; //var_dump($contcats);exit;
if ($result > 0) { if ($result > 0) {
$result = $object->setCategoriesCommon($contcats, $categ_type, false); $result = $object->setCategoriesCommon($contcats, $categ_type, false);

2
htdocs/product/list.php
View File

@ -301,6 +301,7 @@ if (empty($reshook))
$permissiontoread = $user->rights->produit->lire; $permissiontoread = $user->rights->produit->lire;
$permissiontodelete = $user->rights->produit->supprimer; $permissiontodelete = $user->rights->produit->supprimer;
$permissiontoadd = $user->rights->{$rightskey}->creer;
$uploaddir = $conf->product->dir_output; $uploaddir = $conf->product->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
} }
@ -533,6 +534,7 @@ if ($resql)
$rightskey = 'produit'; $rightskey = 'produit';
if ($type == Product::TYPE_SERVICE) $rightskey = 'service'; if ($type == Product::TYPE_SERVICE) $rightskey = 'service';
if ($user->rights->{$rightskey}->supprimer) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete"); if ($user->rights->{$rightskey}->supprimer) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
if ($user->rights->{$rightskey}->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array(); if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
$massactionbutton = $form->selectMassAction('', $arrayofmassactions); $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

2
htdocs/user/list.php
View File

@ -648,7 +648,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
// -------------------------------------------------------------------- // --------------------------------------------------------------------
$i = 0; $i = 0;
$totalarray = array(); $totalarray = array();
$arrayofselected = array(); $arrayofselected = is_array($toselect) ? $toselect : array();
while ($i < ($limit ? min($num, $limit) : $num)) while ($i < ($limit ? min($num, $limit) : $num))
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);