Skip to content

Commit

Permalink
Fix broken form
Browse files Browse the repository at this point in the history
  • Loading branch information
yorkshire-pudding committed Apr 13, 2024
1 parent fe93898 commit 47ad0cc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
10 changes: 5 additions & 5 deletions js/search_exclude_nid.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
// Handler for .ready() called.
var filtered_nids_list = Array();
jQuery('#edit-submit').click(function() {
var nid = parseInt(jQuery('#edit-search-exclude-nid-search-exclusion-auto').val());
var nid = parseInt(jQuery('#edit-search-exclusion-auto').val());
if (!(isNaN(nid)) && (nid != 0)) {
filtered_nids_list = getFilteredNidList();
if (filtered_nids_list.containsNot(nid)) {
filtered_nids_list.push(nid);
}
jQuery('#edit-search-exclude-nid-search-exclusion-nids').val(filtered_nids_list.join(','));
jQuery('#edit-search-exclude-nid-search-exclusion-auto').val('').focus();
jQuery('#edit-search-exclusion-nids').val(filtered_nids_list.join(','));
jQuery('#edit-search-exclusion-auto').val('').focus();
}
filtered_nids_list = getFilteredNidList();
jQuery('#edit-search-exclude-nid-search-exclusion-nids').val(filtered_nids_list.join(','));
jQuery('#edit-search-exclusion-nids').val(filtered_nids_list.join(','));
});
}
};
Expand All @@ -31,7 +31,7 @@ Array.prototype.containsNot = function(obj) {
}

function getFilteredNidList() {
var nidsList = jQuery('#edit-search-exclude-nid-search-exclusion-nids').val().split(',');
var nidsList = jQuery('#edit-search-exclusion-nids').val().split(',');
var filtered_nids_list = new Array();
var intRegex = /^\d+$/;
for (var i in nidsList) {
Expand Down
13 changes: 7 additions & 6 deletions search_exclude_nid.admin.inc
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
*/
function search_exclude_nid_search_exclusion_form() {
$form = array();

$form['search_exclude_nid_search_exclusion_nids'] = array(
$form['#config'] = 'search_exclude_nid.settings';
$form['search_exclusion_nids'] = array(
'#title' => t('Node ids to be excluded from search result'),
'#type' => 'textfield',
'#maxlength' => '1024',
'#default_value' => implode(',', config_get('search_exclude_nid.settings', 'search_exclusion_nids')),
'#description' => t('Please enter the node ids separated by a "," (for example: 1,23,45)'),
);
$form['search_exclude_nid_search_exclusion_auto'] = array(
$form['search_exclusion_auto'] = array(
'#title' => t('Node title lookup'),
'#type' => 'textfield',
'#autocomplete_path' => 'search_exclusion/autocomplete',
Expand Down Expand Up @@ -65,9 +65,9 @@ function search_exclude_nid_search_exclusion_form() {
function search_exclude_nid_search_exclusion_form_submit($form, &$form_state) {
// This codes makes sure, that only actual node IDs are saved.
// The string entered into the textfield is also transformed into an array.
if (isset($form_state['values']['search_exclude_nid_search_exclusion_nids'])) {
if (isset($form_state['values']['search_exclusion_nids'])) {
$filtered_nid_list = array();
$nid_list = $form_state['values']['search_exclude_nid_search_exclusion_nids'];
$nid_list = $form_state['values']['search_exclusion_nids'];
if ($nid_list) {
$nid_list = explode(',', $nid_list);
foreach ($nid_list as $nid) {
Expand All @@ -78,7 +78,7 @@ function search_exclude_nid_search_exclusion_form_submit($form, &$form_state) {
}
}
}
$form_state['values']['search_exclude_nid_search_exclusion_nids'] = $filtered_nid_list;
$form_state['values']['search_exclusion_nids'] = $filtered_nid_list;
}
}

Expand Down Expand Up @@ -119,6 +119,7 @@ function search_exclude_nid_get_excluded_nodes() {
->fields('n', array('nid', 'title'))
->condition('nid', $search_exclusion_nids, 'IN')
->execute()->fetchAll();
return $result;
}
else {
return array();
Expand Down

0 comments on commit 47ad0cc

Please sign in to comment.