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

Merge branch '1.0-develop' into develop

Browse source
This commit is contained in:
Matthew Penner 2023-08-22 19:22:50 -06:00
commit 6f5fb09c13
No known key found for this signature in database
10 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/scripts/components/server/databases/DatabaseRow.tsx
View file

@ -119,14 +119,14 @@ export default ({ database, className }: Props) => {
<Can action={'database.view_password'}>
<div css={tw`mt-6`}>
<Label>Password</Label>
<CopyOnClick text={database.password}>
<CopyOnClick text={database.password} showInNotification={false}>
<Input type={'text'} readOnly value={database.password} />
</CopyOnClick>
</div>
</Can>
<div css={tw`mt-6`}>
<Label>JDBC Connection String</Label>
<CopyOnClick text={jdbcConnectionString}>
<CopyOnClick text={jdbcConnectionString} showInNotification={false}>
<Input type={'text'} readOnly value={jdbcConnectionString} />
</CopyOnClick>
</div>

3
resources/scripts/components/server/files/FileObjectRow.tsx
View file

@ -18,11 +18,12 @@ import { ServerContext } from '@/state/server';
import styles from './style.module.css';
function Clickable({ file, children }: { file: FileObject; children: ReactNode }) {
const [canRead] = usePermissions(['file.read']);
const [canReadContents] = usePermissions(['file.read-content']);
const id = ServerContext.useStoreState(state => state.server.data!.id);
const directory = ServerContext.useStoreState(state => state.files.directory);
return !canReadContents || (file.isFile && !file.isEditable()) ? (
return (file.isFile && (!file.isEditable() || !canReadContents)) || (!file.isFile && !canRead) ? (
<div className={styles.details}>{children}</div>
) : (
<NavLink

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

@ -93,7 +93,7 @@ const MassActionsBar = () => {
/>
)}
<Portal>
<div className="fixed bottom-0 z-50 mb-6 flex w-full justify-center">
<div className="pointer-events-none fixed bottom-0 z-50 mb-6 flex w-full justify-center">
<FadeTransition duration="duration-75" show={selectedFiles.length > 0} appear unmount>
<div className="pointer-events-auto flex items-center space-x-4 rounded bg-black/50 p-4">
<Button onClick={() => setShowMove(true)}>Move</Button>