Skip to content

Dimpact 35 #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Marcel-wowww wants to merge 3 commits into
base: 7.x-2.x
Choose a base branch
from
Open

Dimpact 35 #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cff5eb
Fix undefined index config wim_faq.module L26
Marcel-wowww May 15, 2020
6971b83
Prevent: DatabaseSchemaObjectExistsException: Table atos_esuite alrea…
Marcel-wowww May 15, 2020
78c94f9
https://www.drupal.org/project/hansel/issues/3136852
Marcel-wowww May 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions drupal-org.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ projects[webform_clear][patch][2471671] = https://www.drupal.org/files/issues/24
; https://www.drupal.org/node/2399645
projects[hansel][patch][2399645] = https://www.drupal.org/files/issues/hansel-broken-token-generation-2399645-1.patch

; Warning: count(): Parameter must be an array or an object that implements Countable in hansel_get_breadcrumbs()
; https://www.drupal.org/project/hansel/issues/3136852
projects[hansel][patch][3136852] = https://www.drupal.org/files/issues/2020-05-15/Parameter-must-be-an-array-or-an-object-that-implements-Countable-3136852-3.patch

; Link
; URL validation rejects existing valid content after upgrade to 7.x-1.4
; https://www.drupal.org/node/2666912
Expand Down
6 changes: 6 additions & 0 deletions modules/features/atos_esuite/atos_esuite.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @file
* Install file.
Expand Down Expand Up @@ -71,6 +72,11 @@ function atos_esuite_uninstall() {
variable_del('atos_esuite_url');
variable_del('atos_esuite_chunk_size');
variable_del('atos_default_format');

// DIMPACT-35: Drop table on uninstall to prevent error on reinstall.
if (db_table_exists('atos_esuite')) {
db_drop_table('atos_esuite');
}
}

/**
Expand Down
8 changes: 4 additions & 4 deletions modules/features/wim_faq/wim_faq.module
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @file
* Code for the WIM FAQ feature.
Expand All @@ -23,7 +24,6 @@ function wim_faq_views_pre_render($view) {
*/
function wim_faq_form_felix_attributes_form_alter(&$form, &$form_state, $form_id) {
$felix_block = $form['#felix_block'];
$felix_block_config = $felix_block->data['config'];
if ($felix_block->delta === 'faq-faq_overview_block') {
$faq_vocabulary = taxonomy_vocabulary_machine_name_load('faq_categories');
$faq_terms = taxonomy_get_tree($faq_vocabulary->vid);
Expand All @@ -36,9 +36,11 @@ function wim_faq_form_felix_attributes_form_alter(&$form, &$form_state, $form_id
'#type' => 'select',
'#title' => t('FAQ category'),
'#options' => $faq_categories,
'#default_value' => $felix_block_config['faq_category'],
'#required' => TRUE,
];
if (isset($felix_block->data['config']['faq_category'])) {
$form['faq_category']['#default_value'] = $felix_block->data['config']['faq_category'];
}
}
}
}
Expand Down Expand Up @@ -108,6 +110,4 @@ function wim_faq_block_view($delta = '', $config = []) {

return NULL;


$t='';
}