Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2263 from pterodactyl/fix/2253

Browse source 
Fix #2253
This commit is contained in:
Dane Everitt 2020-08-24 19:08:36 -07:00 committed by GitHub
commit 5b1456b58f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/assets/svgs/file_upload.svg
View file

File diff suppressed because one or more lines are too long
Side by side

Before

Width:  |  Height:  |  Size: 33 KiB

2
resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx
View file

@ -45,7 +45,7 @@ export default ({ withinFileEditor, isNewFile }: Props) => {
return ( return (
<div css={tw`flex items-center text-sm mb-4 text-neutral-500`}> <div css={tw`flex items-center text-sm mb-4 text-neutral-500`}>
{(files && files.length && !params?.action) && {(files && files.length > 0 && !params?.action) &&
<FileActionCheckbox <FileActionCheckbox
type={'checkbox'} type={'checkbox'}
css={tw`mx-4`} css={tw`mx-4`}

4
resources/scripts/components/server/files/UploadButton.tsx
View file

@ -11,6 +11,7 @@ import useEventListener from '@/plugins/useEventListener';
import SpinnerOverlay from '@/components/elements/SpinnerOverlay'; import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
import useFlash from '@/plugins/useFlash'; import useFlash from '@/plugins/useFlash';
import useFileManagerSwr from '@/plugins/useFileManagerSwr'; import useFileManagerSwr from '@/plugins/useFileManagerSwr';
import { ServerContext } from '@/state/server';
const InnerContainer = styled.div` const InnerContainer = styled.div`
max-width: 600px; max-width: 600px;
@ -23,6 +24,7 @@ export default () => {
const [ loading, setLoading ] = useState(false); const [ loading, setLoading ] = useState(false);
const { mutate } = useFileManagerSwr(); const { mutate } = useFileManagerSwr();
const { clearFlashes, clearAndAddHttpError } = useFlash(); const { clearFlashes, clearAndAddHttpError } = useFlash();
const directory = ServerContext.useStoreState(state => state.files.directory);
useEventListener('dragenter', e => { useEventListener('dragenter', e => {
e.stopPropagation(); e.stopPropagation();
@ -60,7 +62,7 @@ export default () => {
setLoading(true); setLoading(true);
clearFlashes('files'); clearFlashes('files');
getFileUploadUrl(uuid) getFileUploadUrl(uuid)
.then(url => axios.post(url, form, { .then(url => axios.post(`${url}&directory=${directory}`, form, {
headers: { headers: {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
}, },