From 992a6fc7b92bd5d9826828e83d5979eba5b66423 Mon Sep 17 00:00:00 2001 From: eholgu401 Date: Tue, 22 Aug 2023 13:19:57 -0600 Subject: [PATCH] simplify conditional --- traffic_ops/traffic_ops_golang/parameter/parameters.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/traffic_ops/traffic_ops_golang/parameter/parameters.go b/traffic_ops/traffic_ops_golang/parameter/parameters.go index 3595ced557..43f73dd5d2 100644 --- a/traffic_ops/traffic_ops_golang/parameter/parameters.go +++ b/traffic_ops/traffic_ops_golang/parameter/parameters.go @@ -176,18 +176,10 @@ func (param *TOParameter) Read(h http.Header, useIMS bool) ([]interface{}, error return nil, nil, errors.New("scanning " + param.GetType() + ": " + err.Error()), http.StatusInternalServerError, nil } if p.Secure != nil && *p.Secure { - if param.ReqInfo.Version.Major >= 5 { + if (param.ReqInfo.Version.Major == 4 && param.ReqInfo.Config.RoleBasedPermissions) || param.ReqInfo.Version.Major >= 5 { if !param.ReqInfo.User.Can("PARAMETER-SECURE:READ") { p.Value = &HiddenField } - } else if param.ReqInfo.Version.Major == 4 { - if param.ReqInfo.Config.RoleBasedPermissions { - if !param.ReqInfo.User.Can("PARAMETER-SECURE:READ") { - p.Value = &HiddenField - } - } else if param.ReqInfo.User.PrivLevel < auth.PrivLevelAdmin { - p.Value = &HiddenField - } } else if param.ReqInfo.User.PrivLevel < auth.PrivLevelAdmin { p.Value = &HiddenField }