From b2d9aa83a8f22b1f3cede71fb0f9e053b1492da6 Mon Sep 17 00:00:00 2001 From: manuwelakanade <42827843+manuwelakanade@users.noreply.github.com> Date: Thu, 22 Feb 2024 13:29:36 +0530 Subject: [PATCH] MFW-4442 Removing logo and image name (#364) --- services/captiveportal/captiveportal.go | 39 +++++++------------------ 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/services/captiveportal/captiveportal.go b/services/captiveportal/captiveportal.go index ef6d937b..1d438024 100644 --- a/services/captiveportal/captiveportal.go +++ b/services/captiveportal/captiveportal.go @@ -23,29 +23,17 @@ type CpRules struct { Action *CpRulesAction `json:"Action,omitempty"` } -type ImageDetails struct { - ImageName string `json:"imageName,omitempty"` -} - -func (x *ImageDetails) GetImageName() string { - if x != nil { - return x.ImageName - } - return "" -} - type CpSettingType struct { - Enabled bool `json:"Enabled,omitempty"` - TimeoutValue int32 `json:"TimeoutValue,omitempty"` - TimeoutPeriod string `json:"TimeoutPeriod,omitempty"` - AcceptText string `json:"AcceptText,omitempty"` - AcceptButtonText string `json:"AcceptButtonText,omitempty"` - MessageHeading string `json:"MessageHeading,omitempty"` - MessageText string `json:"MessageText,omitempty"` - WelcomeText string `json:"WelcomeText,omitempty"` - PageTitle string `json:"PageTitle,omitempty"` - Logo *ImageDetails `json:"logo,omitempty"` - Rules []*CpRules `json:"Rules,omitempty"` + Enabled bool `json:"Enabled,omitempty"` + TimeoutValue int32 `json:"TimeoutValue,omitempty"` + TimeoutPeriod string `json:"TimeoutPeriod,omitempty"` + AcceptText string `json:"AcceptText,omitempty"` + AcceptButtonText string `json:"AcceptButtonText,omitempty"` + MessageHeading string `json:"MessageHeading,omitempty"` + MessageText string `json:"MessageText,omitempty"` + WelcomeText string `json:"WelcomeText,omitempty"` + PageTitle string `json:"PageTitle,omitempty"` + Rules []*CpRules `json:"Rules,omitempty"` } func (x *CpSettingType) GetEnabled() bool { @@ -111,13 +99,6 @@ func (x *CpSettingType) GetPageTitle() string { return "" } -func (x *CpSettingType) GetLogo() *ImageDetails { - if x != nil { - return x.Logo - } - return nil -} - func (x *CpSettingType) GetRules() []*CpRules { if x != nil { return x.Rules