Mathis/lemma
1
0
Fork 0
mirror of https://github.com/lordmathis/lemma.git synced 2025-11-06 07:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix settings saving

Browse Source
This commit is contained in:
Matúš Námešný
2024-10-22 21:21:18 +02:00
parent a231fc48c2
commit 05dd3a83b0
8 changed files with 66 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/internal/api/workspace_handlers.go
View File

@@ -218,21 +218,29 @@ func UpdateWorkspaceSettings(db *db.DB, fs *filesystem.FileSystem) http.HandlerF
return
}
var settings models.WorkspaceSettings
if err := json.NewDecoder(r.Body).Decode(&settings); err != nil {
var userSettings models.UserSettings
if err := json.NewDecoder(r.Body).Decode(&userSettings); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
if err := userSettings.Validate(); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
settings.WorkspaceID = workspaceID
workspaceSettings := &models.WorkspaceSettings{
WorkspaceID: workspaceID,
Settings: userSettings,
}
if err := db.SaveWorkspaceSettings(&settings); err != nil {
if err := db.SaveWorkspaceSettings(workspaceSettings); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
if settings.Settings.GitEnabled {
err := fs.SetupGitRepo(userID, workspaceID, settings.Settings.GitURL, settings.Settings.GitUser, settings.Settings.GitToken)
if userSettings.GitEnabled {
err := fs.SetupGitRepo(userID, workspaceID, userSettings.GitURL, userSettings.GitUser, userSettings.GitToken)
if err != nil {
http.Error(w, "Failed to setup git repo", http.StatusInternalServerError)
return
@@ -241,6 +249,6 @@ func UpdateWorkspaceSettings(db *db.DB, fs *filesystem.FileSystem) http.HandlerF
fs.DisableGitRepo(userID, workspaceID)
}
respondJSON(w, settings)
respondJSON(w, workspaceSettings)
}
}