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

Add hidden search parameter search_current_entity

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-12 18:13:51 +02:00
parent 778093f382
commit c510b7d4df
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/admin/defaultvalues.php
View File

@ -383,7 +383,12 @@ if (!is_array($result) && $result < 0) {
print '</td>'; print '</td>';
} }
print '<td></td>'; // Multicompany
print '<td>';
if (isModEnabled('multicompany')) {
print dol_escape_htmltag($defaultvalue->entity);
}
print '</td>';
// Actions // Actions
print '<td class="center">'; print '<td class="center">';

2
htdocs/modulebuilder/template/myobject_list.php
View File

@ -305,7 +305,7 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint; $sql .= $hookmanager->resPrint;
if ($object->ismultientitymanaged == 1) { if ($object->ismultientitymanaged == 1) {
$sql .= " WHERE t.entity IN (".getEntity($object->element).")"; $sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
} else { } else {
$sql .= " WHERE 1 = 1"; $sql .= " WHERE 1 = 1";
} }

3
htdocs/projet/list.php
View File

@ -117,6 +117,7 @@ $search_price_registration = GETPOST("search_price_registration", 'alpha');
$search_price_booth = GETPOST("search_price_booth", 'alpha'); $search_price_booth = GETPOST("search_price_booth", 'alpha');
$search_login = GETPOST('search_login', 'alpha'); $search_login = GETPOST('search_login', 'alpha');
$search_import_key = GETPOST('search_import_key', 'alpha'); $search_import_key = GETPOST('search_import_key', 'alpha');
$search_current_entity = GETPOST('search_current_entity', 'alpha');
$searchCategoryCustomerOperator = 0; $searchCategoryCustomerOperator = 0;
if (GETPOSTISSET('formfilteraction')) { if (GETPOSTISSET('formfilteraction')) {
$searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int'); $searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
@ -473,7 +474,7 @@ if ($search_project_contact > 0) {
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint; $sql .= $hookmanager->resPrint;
$sql .= " WHERE p.entity IN (".getEntity('project').')'; $sql .= " WHERE p.entity IN (".getEntity('project', $search_current_entity ? 0 : 1).')';
if (empty($user->rights->projet->all->lire)) { if (empty($user->rights->projet->all->lire)) {
$sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users $sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
} }