Browse Source

set NetworkUser defaults

afeiszli 2 years ago
parent
commit
255e400be8
3 changed files with 12 additions and 1 deletions
  1. 1 0
      controllers/networkusers.go
  2. 1 1
      logic/pro/networkuser.go
  3. 10 0
      models/promodels/networkuser.go

+ 1 - 0
controllers/networkusers.go

@@ -95,6 +95,7 @@ func getNetworkUserData(w http.ResponseWriter, r *http.Request) {
 				Nodes:       netUser.Nodes,
 				Clients:     netUser.Clients,
 			}
+			newData.User.SetDefaults()
 			// check network level permissions
 			if doesNetworkAllow := pro.IsUserAllowed(&networks[i], networkUserName, u.Groups); doesNetworkAllow || netUser.AccessLevel == pro.NET_ADMIN {
 				netNodes, err := logic.GetNetworkNodes(netID)

+ 1 - 1
logic/pro/networkuser.go

@@ -49,7 +49,7 @@ func CreateNetworkUser(network *models.Network, user *promodels.NetworkUser) err
 	if err != nil {
 		return err
 	}
-
+	user.SetDefaults()
 	currentUsers.Add(user)
 	data, err := json.Marshal(currentUsers)
 	if err != nil {

+ 10 - 0
models/promodels/networkuser.go

@@ -25,3 +25,13 @@ func (N NetworkUserMap) Delete(ID NetworkUserID) {
 func (N NetworkUserMap) Add(User *NetworkUser) {
 	N[User.ID] = *User
 }
+
+// SetDefaults - adds the defaults to network user
+func (U *NetworkUser) SetDefaults() {
+	if U.Clients == nil {
+		U.Clients = []string{}
+	}
+	if U.Nodes == nil {
+		U.Nodes = []string{}
+	}
+}