colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #873 from LaurenceJJones/fix-default-image-delete 

fix: hide delete overlay for default app images
This commit is contained in:
Jannis Mattheis 2025-11-16 11:41:52 +01:00 committed by GitHub
parent 2b67bc33cb 883cc15bae
commit 2a6f9fbc7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/application.go
View File

@ -431,6 +431,7 @@ func (a *ApplicationAPI) RemoveApplicationImage(ctx *gin.Context) {
func withResolvedImage(app *model.Application) *model.Application { func withResolvedImage(app *model.Application) *model.Application {
if app.Image == "" { if app.Image == "" {
// This must stay in sync with the isDefaultImage check in ui/src/application/Applications.tsx.
app.Image = "static/defaultapp.png" app.Image = "static/defaultapp.png"
} else { } else {
app.Image = "image/" + app.Image app.Image = "image/" + app.Image

6
ui/src/application/Applications.tsx
View File

@ -197,12 +197,16 @@ const Row = ({
fEdit, fEdit,
}: IRowProps) => { }: IRowProps) => {
const {classes} = useStyles(); const {classes} = useStyles();
const isDefaultImage = image === 'static/defaultapp.png';
return ( return (
<TableRow> <TableRow>
<TableCell padding="normal"> <TableCell padding="normal">
<div style={{display: 'flex'}}> <div style={{display: 'flex'}}>
<Tooltip title="Delete image" placement="top" arrow> <Tooltip title="Delete image" placement="top" arrow>
<ButtonBase className={classes.imageContainer} onClick={fDeleteImage}> <ButtonBase
className={classes.imageContainer}
onClick={fDeleteImage}
disabled={isDefaultImage}>
<img <img
src={config.get('url') + image} src={config.get('url') + image}
alt="app logo" alt="app logo"