Skip to content

Commit 6274c45

Browse files
committed
COrrectly set the breadcrumbs when using browser back; closes pterodactyl#2485
1 parent 7a0ac1d commit 6274c45

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

resources/scripts/components/server/files/FileEditContainer.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,17 @@ export default () => {
3232

3333
const id = ServerContext.useStoreState(state => state.server.data!.id);
3434
const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
35+
const setDirectory = ServerContext.useStoreActions(actions => actions.files.setDirectory);
3536
const { addError, clearFlashes } = useFlash();
3637

3738
let fetchFileContent: null | (() => Promise<string>) = null;
3839

3940
useEffect(() => {
4041
if (action === 'new') return;
4142

42-
setLoading(true);
4343
setError('');
44+
setLoading(true);
45+
setDirectory(hash.replace(/^#/, '').split('/').filter(v => !!v).slice(0, -1).join('/'));
4446
getFileContents(uuid, hash.replace(/^#/, ''))
4547
.then(setContent)
4648
.catch(error => {

resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,15 @@ export default ({ withinFileEditor, isNewFile }: Props) => {
4545

4646
return (
4747
<div css={tw`flex items-center text-sm mb-4 text-neutral-500`}>
48-
{(files && files.length > 0 && !params?.action) &&
49-
<FileActionCheckbox
50-
type={'checkbox'}
51-
css={tw`mx-4`}
52-
checked={selectedFilesLength === (files ? files.length : -1)}
53-
onChange={onSelectAllClick}
54-
/>
48+
{(files && files.length > 0 && !params?.action) ?
49+
<FileActionCheckbox
50+
type={'checkbox'}
51+
css={tw`mx-4`}
52+
checked={selectedFilesLength === (files ? files.length : -1)}
53+
onChange={onSelectAllClick}
54+
/>
55+
:
56+
<div css={tw`w-12`}/>
5557
}
5658
/<span css={tw`px-1 text-neutral-300`}>home</span>/
5759
<NavLink

0 commit comments

Comments
 (0)