Skip to content
Snippets Groups Projects
Commit 595fc788 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FEAT #1281 TIME 0:30 renamed project to folder

parent 3a9f391e
No related branches found
No related tags found
No related merge requests found
...@@ -275,7 +275,7 @@ if ($core_tools->is_module_loaded('entities')) { ...@@ -275,7 +275,7 @@ if ($core_tools->is_module_loaded('entities')) {
// Folder // Folder
$arr_tmp2 = array('label' => _PROJECT, 'type' => 'input_text', 'param' => array('field_label' => _PROJECT, 'other' => $size)); $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 // Department number
include("apps/maarch_entreprise/department_list.php"); include("apps/maarch_entreprise/department_list.php");
......
...@@ -226,9 +226,9 @@ if (count($_REQUEST['meta']) > 0) { ...@@ -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 .= " (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 "; $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'])); $arrayPDO = array_merge($arrayPDO, array(":contactType" => $_REQUEST['contact_type']));
} elseif ($tab_id_fields[$j] == 'project' && !empty($_REQUEST['project'])) { } elseif ($tab_id_fields[$j] == 'folder' && !empty($_REQUEST['folder'])) {
$json_txt .= " 'project' : ['".addslashes(trim($_REQUEST['project']))."'],"; $json_txt .= " 'folder' : ['".addslashes(trim($_REQUEST['folder']))."'],";
$folder = $func->wash($_REQUEST['project'], "no", _MARKET, "no"); $folder = $func->wash($_REQUEST['folder'], "no", _MARKET, "no");
$where_request .= " res_id in ( "; $where_request .= " res_id in ( ";
......
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
<parameter name="process_limit_date_to" type="string" /> <parameter name="process_limit_date_to" type="string" />
<parameter name="destinataire_chosen" type="identifier" /> <parameter name="destinataire_chosen" type="identifier" />
<parameter name="destinataire_available" 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="priority" type="string" />
<parameter name="indexingCustomField_*" type="string" /> <parameter name="indexingCustomField_*" type="string" />
<parameter name="signatory_group" type="identifier" /> <parameter name="signatory_group" type="identifier" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment