Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

This commit is contained in:
Dane Everitt 2020-09-16 20:28:53 -07:00
commit cca537d650
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53

View file

@ -171,7 +171,9 @@ const FileDropdownMenu = ({ file }: { file: FileObject }) => {
<Row onClick={doArchive} icon={faFileArchive} title={'Archive'}/> <Row onClick={doArchive} icon={faFileArchive} title={'Archive'}/>
</Can> </Can>
} }
{file.isFile &&
<Row onClick={doDownload} icon={faFileDownload} title={'Download'}/> <Row onClick={doDownload} icon={faFileDownload} title={'Download'}/>
}
<Can action={'file.delete'}> <Can action={'file.delete'}>
<Row onClick={() => setShowConfirmation(true)} icon={faTrashAlt} title={'Delete'} $danger/> <Row onClick={() => setShowConfirmation(true)} icon={faTrashAlt} title={'Delete'} $danger/>
</Can> </Can>