Merge pull request #1717 from LalitDeore/release-changes

add theming changes for onprem
2025-06-04 18:37:47 +02:00
parent 6ad756f8d8 cdffb159f9
commit d3cd1d16b8
2 changed files with 12 additions and 4 deletions
@@ -1068,8 +1068,6 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
 		activatedAppIds = append(activatedAppIds, app.ID)
 	}

-	userInfo.ActiveOrg.Branding = org.Branding
-
 	returnValue := shuffle.HandleInfo{
 		Success:   true,
 		Username:  userInfo.Username,
@@ -1092,6 +1090,7 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
 		Priorities: orgPriorities,
 		Licensed:   licensed,
 		ActiveApps: activatedAppIds,
+		Theme:      userInfo.Theme,
 	}

 	returnData, err := json.Marshal(returnValue)