Compare commits

..

2 Commits

Author SHA1 Message Date
Adrian Zürcher
c4bd121388 change workspace from string to model 2026-02-17 16:34:47 +01:00
Adrian Zürcher
e26c2af201 add uuid nil check 2026-02-17 12:16:21 +01:00
2 changed files with 18 additions and 11 deletions

View File

@@ -154,8 +154,8 @@ func (aH *AccessHandler) DeleteWorkspace(c *gin.Context) {
return
}
for _, u := range users {
if u.Settings.Workspace == workspace.Name {
u.Settings.Workspace = ""
if u.Settings.Workspace.Name == workspace.Name {
u.Settings.Workspace = nil
}
u.Workspaces = slices.DeleteFunc(u.Workspaces, func(w *models.Workspace) bool {
@@ -188,12 +188,19 @@ func (aH *AccessHandler) ReadWorkspaceData(c *gin.Context) {
return
}
if workspace.Uuid == uuid.Nil {
aH.logger.Error("ReadWorkspaceData", "uuid nil")
c.JSON(http.StatusBadRequest, nil)
return
}
files, err := os.ReadDir(workspace.Uuid.String())
if err != nil {
aH.logger.Error("ReadWorkspaceData", err)
c.JSON(http.StatusBadRequest, nil)
return
}
var response []string
for _, f := range files {
if f.IsDir() || !strings.Contains(filepath.Ext(f.Name()), ".db") {

View File

@@ -7,15 +7,15 @@ import (
)
type Settings struct {
PrimaryColor string `json:"primaryColor,omitempty"`
PrimaryColorText string `json:"primaryColorText,omitempty"`
SecondaryColor string `json:"secondaryColor,omitempty"`
SecondaryColorText string `json:"secondaryColorText,omitempty"`
Icon string `json:"icon,omitempty"`
AppName string `json:"appName,omitempty"`
DatabaseName string `json:"databaseName,omitempty"`
DatabaseToken string `json:"databaseToken,omitempty"`
Workspace string `json:"workspace,omitempty"`
PrimaryColor string `json:"primaryColor,omitempty"`
PrimaryColorText string `json:"primaryColorText,omitempty"`
SecondaryColor string `json:"secondaryColor,omitempty"`
SecondaryColorText string `json:"secondaryColorText,omitempty"`
Icon string `json:"icon,omitempty"`
AppName string `json:"appName,omitempty"`
DatabaseName string `json:"databaseName,omitempty"`
DatabaseToken string `json:"databaseToken,omitempty"`
Workspace *Workspace `json:"workspace,omitempty"`
}
func (s *Settings) DefaultQuasarSettings() {