diff --git a/apps/maarch_entreprise/indexing_searching/search_adv.php b/apps/maarch_entreprise/indexing_searching/search_adv.php index 4fd6ac227b5902ffa174ad5a2a9556f9d0c0bdf5..5f7f0bd5b11f6cf8bdc80d28625b4992b9761402 100755 --- a/apps/maarch_entreprise/indexing_searching/search_adv.php +++ b/apps/maarch_entreprise/indexing_searching/search_adv.php @@ -275,7 +275,7 @@ if ($core_tools->is_module_loaded('entities')) { // Folder $arr_tmp2 = array('label' => _PROJECT, 'type' => 'input_text', 'param' => array('field_label' => _PROJECT, 'other' => $size)); -$param['project'] = $arr_tmp2; +$param['folder'] = $arr_tmp2; // Department number include("apps/maarch_entreprise/department_list.php"); diff --git a/apps/maarch_entreprise/indexing_searching/search_adv_result.php b/apps/maarch_entreprise/indexing_searching/search_adv_result.php index 34febc2583cce5bd267ba08f83cd59cf3265657c..c6bb705d4bb7ee2893071b4e966bdecfab6d51ad 100755 --- a/apps/maarch_entreprise/indexing_searching/search_adv_result.php +++ b/apps/maarch_entreprise/indexing_searching/search_adv_result.php @@ -226,9 +226,9 @@ if (count($_REQUEST['meta']) > 0) { $where_request .= " (res_id in (select res_id from contacts_res where contact_id in(select cast (contact_id as varchar) from view_contacts where contact_type = :contactType)) or "; $where_request .= " (contact_id in(select contact_id from view_contacts where contact_type = :contactType))) and "; $arrayPDO = array_merge($arrayPDO, array(":contactType" => $_REQUEST['contact_type'])); - } elseif ($tab_id_fields[$j] == 'project' && !empty($_REQUEST['project'])) { - $json_txt .= " 'project' : ['".addslashes(trim($_REQUEST['project']))."'],"; - $folder = $func->wash($_REQUEST['project'], "no", _MARKET, "no"); + } elseif ($tab_id_fields[$j] == 'folder' && !empty($_REQUEST['folder'])) { + $json_txt .= " 'folder' : ['".addslashes(trim($_REQUEST['folder']))."'],"; + $folder = $func->wash($_REQUEST['folder'], "no", _MARKET, "no"); $where_request .= " res_id in ( "; diff --git a/apps/maarch_entreprise/xml/IVS/validation_rules.xml b/apps/maarch_entreprise/xml/IVS/validation_rules.xml index 920c63f5e970ebe3614fda4a59bd35b47578a16b..c32b61ad789ae7db879e6da3715f2de0cda520a0 100755 --- a/apps/maarch_entreprise/xml/IVS/validation_rules.xml +++ b/apps/maarch_entreprise/xml/IVS/validation_rules.xml @@ -342,7 +342,7 @@ <parameter name="process_limit_date_to" type="string" /> <parameter name="destinataire_chosen" type="identifier" /> <parameter name="destinataire_available" type="identifier" /> - <parameter name="project" type="string" /> + <parameter name="folder" type="string" /> <parameter name="priority" type="string" /> <parameter name="indexingCustomField_*" type="string" /> <parameter name="signatory_group" type="identifier" />