Skip to content
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

UHF-X Journey planner hotfix #977

Merged
merged 4 commits into from
Nov 22, 2024
Merged

UHF-X Journey planner hotfix #977

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78408a3
Merge pull request #961 from City-of-Helsinki/dev
khalima Nov 19, 2024
7c133c4
Merge pull request #972 from City-of-Helsinki/dev
teroelonen Nov 20, 2024
b5c66f7
Added fallback to EU cookie compliance module.
khalima Nov 22, 2024
d804af9
Removed PHPDoc tag.
khalima Nov 22, 2024
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
11 changes: 8 additions & 3 deletions public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,12 @@ function hdbt_subtheme_preprocess_paragraph__journey_planner(array &$variables):
$variables['media_id'] = 'journey-map';

// Set the privacy policy URL.
/** @var \Drupal\hdbt_cookie_banner\Services\CookieSettings $cookie_settings */
$cookie_settings = \Drupal::service('hdbt_cookie_banner.cookie_settings');
$variables['privacy_policy_url'] = $cookie_settings->getCookieSettingsPageUrl();
if (Drupal::moduleHandler()->moduleExists('hdbt_cookie_banner')) {
$cookie_settings = Drupal::service('hdbt_cookie_banner.cookie_settings');
$variables['privacy_policy_url'] = $cookie_settings->getCookieSettingsPageUrl();
}
// @todo UHF-10862 Remove once the HDBT cookie banner module is in use.
elseif (Drupal::moduleHandler()->moduleExists('helfi_eu_cookie_compliance')) {
$variables['privacy_policy_url'] = helfi_eu_cookie_compliance_get_privacy_policy_url();
}
}
Loading