Merged by Jenkins

untangle · Feb 23, 2024 · d9ac7b6 · d9ac7b6
2 parents 5cb29be + b2d9aa8
commit d9ac7b6
Showing 1 changed file with 10 additions and 29 deletions.
diff --git 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