mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: '/movie' URL Base breaking UI navigation

This commit is contained in:
bakerboy448 2020-12-22 12:36:01 -06:00 committed by Qstick
parent 3ab9af0663
commit 140547e42a
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/Components/Link/Link.js
View File

@ -47,10 +47,6 @@ class Link extends Component {
el = 'a'; el = 'a';
linkProps.href = to; linkProps.href = to;
linkProps.target = target || '_self'; linkProps.target = target || '_self';
} else if (to.startsWith(`${window.Radarr.urlBase}/`)) {
el = RouterLink;
linkProps.to = to;
linkProps.target = target;
} else { } else {
el = RouterLink; el = RouterLink;
linkProps.to = `${window.Radarr.urlBase}/${to.replace(/^\//, '')}`; linkProps.to = `${window.Radarr.urlBase}/${to.replace(/^\//, '')}`;

2
frontend/src/Components/Page/Header/PageHeader.js
View File

@ -53,7 +53,7 @@ class PageHeader extends Component {
return ( return (
<div className={styles.header}> <div className={styles.header}>
<div className={styles.logoContainer}> <div className={styles.logoContainer}>
<Link to={`${window.Radarr.urlBase}/`}> <Link to={'/'}>
<img <img
className={isSmallScreen ? styles.logo : styles.logoFull} className={isSmallScreen ? styles.logo : styles.logoFull}
src={isSmallScreen ? `${window.Radarr.urlBase}/Content/Images/logo.png` : `${window.Radarr.urlBase}/Content/Images/logo-full.png`} src={isSmallScreen ? `${window.Radarr.urlBase}/Content/Images/logo.png` : `${window.Radarr.urlBase}/Content/Images/logo-full.png`}