bachir/materio-base-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upadted to 1.8

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2013-09-26 15:49:26 +02:00
parent e0ae80791b
commit 128640cd15
52 changed files with 2604 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search_api.admin.inc
+20 -6
View File
@@ -953,7 +953,10 @@ function search_api_admin_index_status_form_submit(array $form, array &$form_sta
$pre = 'admin/config/search/search_api/index/' . $index->machine_name;
switch ($values['op']) {
case t('Enable'):
$redirect = $pre . '/enable';
$redirect = array(
$pre . '/enable',
array('query' => array('token' => drupal_get_token($index->machine_name))),
);
break;
case t('Disable'):
$redirect = $pre . '/disable';
@@ -1480,15 +1483,15 @@ function search_api_admin_index_fields(array $form, array &$form_state, SearchAp
$fulltext_type = array(0 => 'text');
$entity_types = entity_get_info();
$default_types = search_api_default_field_types();
// $boosts = drupal_map_assoc(array('0.1', '0.2', '0.3', '0.5', '0.8', '1.0', '2.0', '3.0', '5.0', '8.0', '13.0', '21.0', '5000', '10000', '20000', '40000', '80000', '160000', '320000'));
$boosts = drupal_map_assoc(array('0.1', '0.2', '0.3', '0.5', '0.8', '1.0', '2.0', '3.0', '5.0', '8.0', '13.0', '21.0', '100', '1000', '1010', '1020', '1030', '1040', '1050', '1060'));
$boosts = drupal_map_assoc(array('0.1', '0.2', '0.3', '0.5', '0.8', '1.0', '2.0', '3.0', '5.0', '8.0', '13.0', '21.0'));
$form_state['index'] = $index;
$form['#theme'] = 'search_api_admin_fields_table';
$form['#tree'] = TRUE;
$form['description'] = array(
'#type' => 'item',
'#title' => t('Select fields to index'),
'#description' => t('<p>The datatype of a field determines how it can be used for searching and filtering. ' .
'#description' => t('<p>The datatype of a field determines how it can be used for searching and filtering. Fields indexed with type "Fulltext" and multi-valued fields (marked with <sup>1</sup>) cannot be used for sorting. ' .
'The boost is used to give additional weight to certain fields, e.g. titles or tags. It only takes effect for fulltext fields.</p>' .
'<p>Whether detailed field types are supported depends on the type of server this index resides on. ' .
'In any case, fields of type "Fulltext" will always be fulltext-searchable.</p>'),
@@ -1499,6 +1502,11 @@ function search_api_admin_index_fields(array $form, array &$form_state, SearchAp
}
foreach ($fields as $key => $info) {
$form['fields'][$key]['title']['#markup'] = check_plain($info['name']);
if (search_api_is_list_type($info['type'])) {
$form['fields'][$key]['title']['#markup'] .= ' <sup><a href="#note-multi-valued" class="note-ref">1</a></sup>';
$multi_valued_field_present = TRUE;
}
$form['fields'][$key]['machine_name']['#markup'] = check_plain($key);
if (isset($info['description'])) {
$form['fields'][$key]['description'] = array(
'#type' => 'value',
@@ -1587,6 +1595,10 @@ function search_api_admin_index_fields(array $form, array &$form_state, SearchAp
}
}
if (!empty($multi_valued_field_present)) {
$form['note']['#markup'] = '<div id="note-multi-valued"><small><sup>1</sup> ' . t('Multi-valued field') . '</small></div>';
}
$form['submit'] = array(
'#type' => 'submit',
'#value' => t('Save changes'),
@@ -1745,7 +1757,7 @@ function _search_api_admin_get_fields(SearchApiIndex $index, EntityMetadataWrapp
*/
function theme_search_api_admin_fields_table($variables) {
$form = $variables['element'];
$header = array(t('Field'), t('Indexed'), t('Type'), t('Boost'));
$header = array(t('Field'), t('Machine name'), t('Indexed'), t('Type'), t('Boost'));
$rows = array();
foreach (element_children($form['fields']) as $name) {
@@ -1766,11 +1778,13 @@ function theme_search_api_admin_fields_table($variables) {
}
}
$note = isset($form['note']) ? $form['note'] : '';
$submit = $form['submit'];
$additional = isset($form['additional']) ? $form['additional'] : FALSE;
unset($form['submit'], $form['additional']);
unset($form['note'], $form['submit'], $form['additional']);
$output = drupal_render_children($form);
$output .= theme('table', array('header' => $header, 'rows' => $rows));
$output .= render($note);
$output .= render($submit);
if ($additional) {
$output .= render($additional);