marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1833 from LalitDeore/license-1

Browse Source 
Fix - branding isues
This commit is contained in:
Frikky
2025-10-08 14:54:01 +02:00
committed by GitHub
parent 034c2bba62 ded032d93e
commit 14d1399e5c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/main.go
+5 -2
View File
@@ -1138,7 +1138,8 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
// Check for licensing/branding of parent and override
parentOrg, err := shuffle.GetOrg(ctx, parentOrgId)
if err == nil {
if parentOrg.LeadInfo.IntegrationPartner {
parent := shuffle.HandleCheckLicense(ctx, *parentOrg)
if parentOrg.LeadInfo.IntegrationPartner || parent.SyncFeatures.Branding.Active {
parsedStatus = append(parsedStatus, "integration_partner")
// except theme take from parent org
@@ -1180,7 +1181,9 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
}
} else {
// for parent org branding
if org.LeadInfo.IntegrationPartner {
licenseOrg := shuffle.HandleCheckLicense(ctx, *org)
org = &licenseOrg
if org.LeadInfo.IntegrationPartner || org.SyncFeatures.Branding.Active {
userInfo.ActiveOrg.Branding.Theme = org.Branding.Theme
userInfo.ActiveOrg.Branding.DocumentationLink = org.Defaults.DocumentationReference
userInfo.ActiveOrg.Branding.SupportEmail = org.Branding.SupportEmail