diff --git a/load_search.php b/load_search.php index 3c79bdd2bf..784ffd25f2 100644 --- a/load_search.php +++ b/load_search.php @@ -9,10 +9,11 @@ require_once 'main/inc/global.inc.php'; api_block_anonymous_users(); -if (!api_is_drh()) { - api_not_allowed(true); -} - +//if (!api_is_platform_admin()) { + if (!api_is_drh()) { + api_not_allowed(true); + } +//} $userId = api_get_user_id(); $userInfo = api_get_user_info(); diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php index c4368bc863..ef08976ceb 100755 --- a/main/inc/lib/extra_field.lib.php +++ b/main/inc/lib/extra_field.lib.php @@ -1049,7 +1049,7 @@ class ExtraField extends Model 'extra_'.$field_details['variable'], $field_details['display_text'], $options, - array('multiple' => 'multiple') + array('multiple' => 'multiple', 'id' => 'extra_'.$field_details['variable']) ); if (!$admin_permissions) { if ($field_details['visible'] == 0) { diff --git a/main/session/session_add.php b/main/session/session_add.php index 7ca0221d1f..50b7038fd3 100644 --- a/main/session/session_add.php +++ b/main/session/session_add.php @@ -220,10 +220,16 @@ $(function() { $('[name=\''+radio+'\']').val([item.value]); break; case '4': // simple select - case '5': // multiple select $('#'+fieldName+'').val(item.value); $('#'+fieldName+'').selectpicker('render'); break; + case '5': // multiple select + if (item.value) { + var values = item.value.split(';'); + $('#'+fieldName+'').val(values); + $('#'+fieldName+'').selectpicker('render'); + } + break; case '8': // double var first = 'first_'+fieldName; var second = 'second_'+fieldName; diff --git a/search.php b/search.php index 0575090a43..0ccce1b292 100644 --- a/search.php +++ b/search.php @@ -28,19 +28,21 @@ $extraFieldValue = new ExtraFieldValue('session'); $extra = $extraField->addElements($form, '', [], true); $form->addButtonSave(get_lang('Save'), 'save'); -$form->addButtonSearch(get_lang('Search'), 'search'); +//$form->addButtonSearch(get_lang('Search'), 'search'); $result = SessionManager::getGridColumns('simple'); $columns = $result['columns']; $column_model = $result['column_model']; - $defaults = []; - +$tagsData = []; if (!empty($items)) { /** @var ExtraFieldSavedSearch $item */ foreach ($items as $item) { $variable = 'extra_'.$item->getField()->getVariable(); + if ($item->getField()->getFieldType() == Extrafield::FIELD_TYPE_TAG) { + $tagsData[$variable] = $item->getValue(); + } $defaults[$variable] = $item->getValue(); } } @@ -150,15 +152,26 @@ if ($form->validate()) { } } -$htmlHeadXtra[] =' -'; - if (!empty($filterToSend)) { $filterToSend = json_encode($filterToSend); $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_sessions&_search=true&_force_search=true&rows=20&page=1&sidx=&sord=asc&filters2='.$filterToSend; @@ -166,10 +179,6 @@ if (!empty($filterToSend)) { $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_sessions&_search=true&_force_search=true&rows=20&page=1&sidx=&sord=asc'; } - - - - // Autowidth $extra_params['autowidth'] = 'true'; @@ -194,16 +203,16 @@ $action_links = 'function action_formatter(cellvalue, options, rowObject) { $htmlHeadXtra[] = api_get_jqgrid_js(); -$griJs = Display::grid_js('sessions', $url, $columns, $column_model, $extra_params, array(), $action_links, true); +/*$griJs = Display::grid_js('sessions', $url, $columns, $column_model, $extra_params, array(), $action_links, true); $grid = '
'; $grid .= Display::grid_html('sessions'); -$grid .= '
'; +$grid .= '';*/ $tpl = new Template(get_lang('Diagnosis')); $tpl->assign('form', $view); -$tpl->assign('grid', $grid); -$tpl->assign('grid_js', $griJs); +//$tpl->assign('grid', $grid); +//$tpl->assign('grid_js', $griJs); $content = $tpl->fetch('default/user_portal/search_extra_field.tpl'); $tpl->assign('content', $content); $tpl->display_one_col_template();