ofaj
jmontoya 10 years ago
parent f25aa1ff48
commit c13bf5c79f
  1. 7
      load_search.php
  2. 18
      main/inc/lib/extra_field.lib.php

@ -46,10 +46,13 @@ if (!empty($userInfo)) {
}
}
}
if ($userToLoad) {
$formSearch->setDefaults(['user_id' => $userToLoad]);
}
$formSearch->addButtonSearch(get_lang('Search'), 'save');
$form = new FormValidator('search', 'post', api_get_self().'&user_id='.$userToLoad);
$form = new FormValidator('search', 'post', api_get_self().'?user_id='.$userToLoad);
$form->addHeader(get_lang('Diagnosis'));
$form->addHidden('user_id', $userToLoad);
@ -67,7 +70,7 @@ $extraField = new ExtraField('session');
$extraFieldValue = new ExtraFieldValue('session');
$extra = $extraField->addElements($form, '', [], true);
$form->addButtonSearch(get_lang('Save'), 'save');
$form->addButtonSearch(get_lang('Search'), 'save');
$result = SessionManager::getGridColumns('simple');
$columns = $result['columns'];

@ -2083,7 +2083,11 @@ EOF;
$val = '%'.$val;
}
if ($oper == 'cn' || $oper == 'nc' || $oper == 'in' || $oper == 'ni') {
$val = '%'.$val.'%';
if (is_array($val)) {
$val = '%'.implode(';', $val).'%';
} else {
$val = '%'.$val.'%';
}
}
$val = \Database::escape_string($val);
@ -2114,15 +2118,13 @@ EOF;
foreach ($filters->rules as $rule) {
if (strpos($rule->field, $stringToSearch) === false) {
//normal fields
// normal fields
$field = $rule->field;
if (isset($rule->data) && $rule->data != -1) {
if (isset($rule->data) && is_string($rule->data) && $rule->data != -1) {
$condition_array[] = $this->get_where_clause($field, $rule->op, $rule->data);
}
} else {
// Extra fields
if (strpos($rule->field, '_second') === false) {
//No _second
$original_field = str_replace($stringToSearch, '', $rule->field);
@ -2134,8 +2136,10 @@ EOF;
$rule->data = $data[1].'::'.$double_select[$rule->field];
} else {
// only was sent 1 select
$data = explode('#', $rule->data);
$rule->data = $data[1];
if (is_string($rule->data)) {
$data = explode('#', $rule->data);
$rule->data = $data[1];
}
}
if (!isset($rule->data)) {

Loading…
Cancel
Save