Skip to content

Commit

Permalink
Fix filter on extrafields
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Nov 7, 2018
1 parent 9a0b5fb commit 66ffcf2
Show file tree
Hide file tree
Showing 50 changed files with 68 additions and 62 deletions.
2 changes: 1 addition & 1 deletion htdocs/adherents/list.php
View file
Expand Up @@ -86,7 +86,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('adherent');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
4 changes: 3 additions & 1 deletion htdocs/adherents/subscription/list.php
View file
Expand Up @@ -53,13 +53,15 @@
if (! $sortorder) { $sortorder="DESC"; }
if (! $sortfield) { $sortfield="c.dateadh"; }

$object = new Subscription($db);

// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('subscriptionlist'));
$extrafields = new ExtraFields($db);

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('subscription');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/emailcollector_card.php
View file
Expand Up @@ -55,7 +55,7 @@
$hookmanager->initHooks(array('emailcollectorcard')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('emailcollector');
$search_array_options = $extrafields->getOptionalsFromPost($extralabels, '', 'search_');
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');

// Initialize array of search criterias
$search_all = trim(GETPOST("search_all", 'alpha'));
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/emailcollector_list.php
View file
Expand Up @@ -67,7 +67,7 @@
$hookmanager->initHooks(array('emailcollectorlist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('emailcollector');
$search_array_options = $extrafields->getOptionalsFromPost($extralabels, '', 'search_');
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');

// Default sort order (if not yet defined by previous GETPOST)
if (! $sortfield) $sortfield="t.".key($object->fields); // Set here default search field. By default 1st field in definition.
Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/mails_senderprofile_list.php
View file
Expand Up @@ -61,7 +61,7 @@
$hookmanager->initHooks(array('emailsenderprofilelist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('emailsenderprofile');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// Default sort order (if not yet defined by previous GETPOST)
if (! $sortfield) $sortfield="t.".key($object->fields); // Set here default search field. By default 1st field in definition.
Expand Down
2 changes: 1 addition & 1 deletion htdocs/asset/card.php
View file
Expand Up @@ -45,7 +45,7 @@
$hookmanager->initHooks(array('assetcard')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('asset');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// Initialize array of search criterias
$search_all=trim(GETPOST("search_all",'alpha'));
Expand Down
2 changes: 1 addition & 1 deletion htdocs/asset/list.php
View file
Expand Up @@ -62,7 +62,7 @@
$hookmanager->initHooks(array('assetlist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('asset');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// Default sort order (if not yet defined by previous GETPOST)
if (! $sortfield) $sortfield="t.".key($object->fields); // Set here default search field. By default 1st field in definition.
Expand Down
10 changes: 5 additions & 5 deletions htdocs/comm/action/list.php
View file
Expand Up @@ -74,10 +74,14 @@
$usergroup = GETPOST("usergroup","int",3);
$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;

// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$object = new ActionComm($db);
$hookmanager->initHooks(array('agendalist'));

$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('actioncomm');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
// If not choice done on calendar owner, we filter on user.
if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
{
Expand Down Expand Up @@ -117,10 +121,6 @@
$filtert=$user->id;
}

// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$object = new ActionComm($db);
$hookmanager->initHooks(array('agendalist'));

$arrayfields=array(
'a.id'=>array('label'=>"Ref", 'checked'=>1),
'owner'=>array('label'=>"Owner", 'checked'=>1),
Expand Down
5 changes: 3 additions & 2 deletions htdocs/comm/mailing/list.php
View file
Expand Up @@ -46,20 +46,21 @@
$search_ref=GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
$filteremail=GETPOST('filteremail','alpha');

$object = new Mailing($db);

// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('mailinglist'));
$extrafields = new ExtraFields($db);

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('mailing');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
'm.titre'=>'Ref',
);

$object = new Mailing($db);



Expand Down
2 changes: 1 addition & 1 deletion htdocs/comm/propal/list.php
View file
Expand Up @@ -129,7 +129,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('propal');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/commande/list.php
View file
Expand Up @@ -108,7 +108,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('commande');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/bank/bankentries_list.php
View file
Expand Up @@ -129,7 +129,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('banktransaction');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost('banktransaction','','search_');

$arrayfields=array(
'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/bank/list.php
View file
Expand Up @@ -74,7 +74,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('bank_account');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/facture/fiche-rec.php
View file
Expand Up @@ -94,7 +94,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('facture_rec');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

$permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
$permissiondellink=$user->rights->facture->creer; // Used by the include of actions_dellink.inc.php
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/facture/invoicetemplate_list.php
View file
Expand Up @@ -108,7 +108,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('facture_rec');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

$permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
$permissiondellink=$user->rights->facture->creer; // Used by the include of actions_dellink.inc.php
Expand Down
2 changes: 1 addition & 1 deletion htdocs/compta/facture/list.php
View file
Expand Up @@ -134,7 +134,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('facture');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/contact/list.php
View file
Expand Up @@ -133,7 +133,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('contact');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/contrat/list.php
View file
Expand Up @@ -100,7 +100,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('contrat');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
'c.ref'=>'Ref',
Expand Down
2 changes: 1 addition & 1 deletion htdocs/contrat/services_list.php
View file
Expand Up @@ -84,7 +84,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('contratdet');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// Security check
$contratid = GETPOST('id','int');
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/lib/company.lib.php
View file
Expand Up @@ -908,7 +908,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
{
if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
}
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($contactstatic->table_element,'','search_');

// Purge search criteria
if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
View file
Expand Up @@ -247,7 +247,7 @@ function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidede

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('movement');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost('movement','','search_');

$productlot=new ProductLot($db);
$productstatic=new Product($db);
Expand Down
5 changes: 3 additions & 2 deletions htdocs/cron/list.php
View file
Expand Up @@ -62,15 +62,16 @@

$diroutputmassaction=$conf->cronjob->dir_output . '/temp/massgeneration/'.$user->id;

$object = new Cronjob($db);

// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('cronjoblist'));
$extrafields = new ExtraFields($db);

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('cronjob');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

$object = new Cronjob($db);


/*
Expand Down
4 changes: 3 additions & 1 deletion htdocs/expedition/list.php
View file
Expand Up @@ -69,13 +69,15 @@

$viewstatut=GETPOST('viewstatut');

$object = new Expedition($db);

// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('shipmentlist'));
$extrafields = new ExtraFields($db);

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('expedition');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/expensereport/list.php
View file
Expand Up @@ -90,7 +90,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('expensereport');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');


// List of fields to search into when doing a "search in all"
Expand Down
4 changes: 2 additions & 2 deletions htdocs/fichinter/card-rec.php
View file
Expand Up @@ -152,7 +152,7 @@
}
}
} elseif ($action == 'createfrommodel') {
$newinter = new fichinter($db);
$newinter = new Fichinter($db);

// on récupère les enregistrements
$object->fetch($id);
Expand All @@ -176,7 +176,7 @@
// on créer un nouvelle intervention
$extrafields = new ExtraFields($db);
$extralabels = $extrafields->fetch_name_optionals_label($newinter->table_element);
$array_options = $extrafields->getOptionalsFromPost($extralabels);
$array_options = $extrafields->getOptionalsFromPost($newinter->table_element);
$newinter->array_options = $array_options;

$newfichinterid = $newinter->create($user);
Expand Down
4 changes: 2 additions & 2 deletions htdocs/fichinter/card.php
View file
Expand Up @@ -258,7 +258,7 @@
// Extrafields
$extrafields = new ExtraFields($db);
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$array_options = $extrafields->getOptionalsFromPost($extralabels);
$array_options = $extrafields->getOptionalsFromPost($object->table_element);

$object->array_options = $array_options;

Expand Down Expand Up @@ -406,7 +406,7 @@
{
// Extrafields
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$array_options = $extrafields->getOptionalsFromPost($extralabels);
$array_options = $extrafields->getOptionalsFromPost($object->table_element);

$object->array_options = $array_options;

Expand Down
2 changes: 1 addition & 1 deletion htdocs/fichinter/list.php
View file
Expand Up @@ -87,7 +87,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('fichinter');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/fourn/commande/list.php
View file
Expand Up @@ -113,7 +113,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('commande_fournisseur');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
2 changes: 1 addition & 1 deletion htdocs/fourn/facture/list.php
View file
Expand Up @@ -130,7 +130,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('facture_fourn');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
Expand Down
10 changes: 5 additions & 5 deletions htdocs/fourn/facture/paiement.php
View file
Expand Up @@ -89,7 +89,7 @@

// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('paymentsupplier');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost('paymentsupplier','','search_');

$arrayfields=array();

Expand Down Expand Up @@ -570,25 +570,25 @@ function callForResult(imgId)
{
print '<td align="center"><b>!!!</b></td>';
}

// Date Max Payment
if ($objp->dlr > 0 )
{
print '<td align="center">';
print dol_print_date($db->jdate($objp->dlr), 'day');

if ($invoice->hasDelay())
{
print img_warning($langs->trans('Late'));
}

print '</td>';
}
else
{
print '<td align="center"><b>--</b></td>';
}

// Multicurrency
if (!empty($conf->multicurrency->enabled))
{
Expand Down
2 changes: 1 addition & 1 deletion htdocs/holiday/list.php
View file
Expand Up @@ -78,7 +78,7 @@
$hookmanager->initHooks(array('holidaylist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('holiday');
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// Default sort order (if not yet defined by previous GETPOST)
if (! $sortfield) $sortfield="cp.rowid";
Expand Down
2 changes: 1 addition & 1 deletion htdocs/modulebuilder/template/myobject_card.php
View file
Expand Up @@ -81,7 +81,7 @@
$hookmanager->initHooks(array('myobjectcard','globalcard')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');

// Initialize array of search criterias
$search_all=trim(GETPOST("search_all",'alpha'));
Expand Down

0 comments on commit 66ffcf2

Please sign in to comment.