Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: only show docker / general settings on environment page
Kyle Mendell57cff793ba3c
diff --git a/backend/internal/api/settings_handler.go b/backend/internal/api/settings_handler.goindex a840210c2..3ee5ef441 100644--- a/backend/internal/api/settings_handler.go+++ b/backend/internal/api/settings_handler.go@@ -26,7 +26,10 @@ func NewSettingsHandler(group *gin.RouterGroup, settingsService *services.Settin}func (h *SettingsHandler) GetSettings(c *gin.Context) {- settings := h.settingsService.ListSettings(true)+ environmentID := c.Param("id")++ showAll := environmentID == "0"+ settings := h.settingsService.ListSettings(showAll)var settingsDto []dto.PublicSettingDtoif err := dto.MapStructList(settings, &settingsDto); err != nil {@@ -70,6 +73,8 @@ func (h *SettingsHandler) GetPublicSettings(c *gin.Context) {}func (h *SettingsHandler) UpdateSettings(c *gin.Context) {+ environmentID := c.Param("id")+var req dto.UpdateSettingsDtoif err := c.ShouldBindJSON(&req); err != nil {c.JSON(http.StatusBadRequest, gin.H{@@ -79,6 +84,18 @@ func (h *SettingsHandler) UpdateSettings(c *gin.Context) {return}+ if environmentID != "0" {+ if req.AuthLocalEnabled != nil || req.AuthOidcEnabled != nil ||+ req.AuthSessionTimeout != nil || req.AuthPasswordPolicy != nil ||+ req.AuthOidcConfig != nil {+ c.JSON(http.StatusForbidden, gin.H{+ "success": false,+ "error": "Authentication settings can only be updated from the main environment",+ })+ return+ }+ }+updatedSettings, err := h.settingsService.UpdateSettings(c.Request.Context(), req)if err != nil {c.JSON(http.StatusInternalServerError, gin.H{diff --git a/frontend/src/routes/environments/[id]/+page.svelte b/frontend/src/routes/environments/[id]/+page.svelteindex 8fd8e59ca..0295c50be 100644--- a/frontend/src/routes/environments/[id]/+page.svelte+++ b/frontend/src/routes/environments/[id]/+page.svelte@@ -225,11 +225,15 @@{#if settings}<div class="border-t pt-6"><div class="mb-4 flex items-center justify-between">- <h3 class="text-lg font-semibold">{m.sidebar_settings()}</h3>- <Button variant="outline" size="sm" onclick={handleEditSettings}>- <SettingsIcon class="mr-2 size-4" />- {m.common_edit()}- </Button>+ <h3 class="text-lg font-semibold">+ {environment.id === '0' ? m.sidebar_settings() : 'Docker & Operational Settings'}+ </h3>+ {#if environment.id === '0'}+ <Button variant="outline" size="sm" onclick={handleEditSettings}>+ <SettingsIcon class="mr-2 size-4" />+ {m.common_edit()}+ </Button>+ {/if}</div><!-- Docker Settings -->@@ -305,8 +309,8 @@</div></div>- <!-- Security Settings -->- {#if settings.authLocalEnabled !== undefined}+ <!-- Security Settings -->+ {#if environment.id === '0' && settings.authLocalEnabled !== undefined}<div class="mb-6"><h4 class="text-muted-foreground mb-3 text-sm font-semibold uppercase tracking-wide">{m.security_title()}@@ -343,7 +347,7 @@{/if}<!-- Navigation Settings -->- {#if settings.mobileNavigationMode !== undefined}+ {#if environment.id === '0' && settings.mobileNavigationMode !== undefined}<div><h4 class="text-muted-foreground mb-3 text-sm font-semibold uppercase tracking-wide">{m.navigation_title()}