Skip to content

Commit 8d67ad7

Browse files
albozektbialcz
andauthored
IBX-10950: Fixed disappearing uper menu after redirection (#1893)
Co-authored-by: Tomasz Białczak <tomasz.bialczak@ibexa.co>
1 parent d109ec2 commit 8d67ad7

4 files changed

Lines changed: 3 additions & 19 deletions

File tree

phpstan-baseline-lte-8.3.neon

Lines changed: 0 additions & 13 deletions
This file was deleted.

phpstan-baseline.neon.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
$includes[] = __DIR__ . '/phpstan-baseline-gte-8.0.neon';
1414
}
1515

16-
if (PHP_VERSION_ID < 8_04_00) {
17-
$includes[] = __DIR__ . '/phpstan-baseline-lte-8.3.neon';
18-
}
19-
2016
$config = [];
2117
$config['includes'] = $includes;
2218

src/bundle/Resources/public/js/scripts/admin.location.tab.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
currentTab.classList.add(CLASS_TAB_ACTIVE);
1212
};
1313
const changeHashForPageReload = (hash) => {
14-
global.location.hash = `${hash}#tab`;
14+
global.history.replaceState(null, '', `${hash}#tab`);
1515
};
1616
const handleTabShown = (event) => {
1717
const { target, relatedTarget } = event;
@@ -35,6 +35,7 @@
3535
bootstrap.Tab.getOrCreateInstance(activeHashTabLink).show();
3636

3737
switchActiveTabs(activeHashTab, currentActiveTab);
38+
changeHashForPageReload(activeHashTabLink.hash);
3839

3940
doc.body.dispatchEvent(new CustomEvent('ibexa:tabs:hash-tab-activated'));
4041
};

src/lib/Form/DataTransformer/DateIntervalToArrayTransformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function reverseTransform($value)
103103
}
104104

105105
if (!empty($value['month']) && !empty($value['day']) && !empty($value['year']) &&
106-
false === checkdate($value['month'], $value['day'], $value['year'])) {
106+
false === checkdate((int)$value['month'], (int)$value['day'], (int)$value['year'])) {
107107
throw new TransformationFailedException('This is an invalid date');
108108
}
109109

0 commit comments

Comments
 (0)