diff --git a/controllers/ext_client.go b/controllers/ext_client.go index 3ac9a05f..9ca316c7 100644 --- a/controllers/ext_client.go +++ b/controllers/ext_client.go @@ -101,7 +101,7 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) { } clients := []models.ExtClient{} var err error - if networksSlice[0] == logic.ALL_NETWORK_ACCESS { + if len(networksSlice) > 0 && networksSlice[0] == logic.ALL_NETWORK_ACCESS { clients, err = functions.GetAllExtClients() if err != nil && !database.IsEmptyRecord(err) { logger.Log(0, "failed to get all extclients: ", err.Error()) diff --git a/controllers/network.go b/controllers/network.go index a91b5164..8121ef8f 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -57,7 +57,7 @@ func getNetworks(w http.ResponseWriter, r *http.Request) { } allnetworks := []models.Network{} var err error - if networksSlice[0] == logic.ALL_NETWORK_ACCESS { + if len(networksSlice) > 0 && networksSlice[0] == logic.ALL_NETWORK_ACCESS { allnetworks, err = logic.GetNetworks() if err != nil && !database.IsEmptyRecord(err) { logger.Log(0, r.Header.Get("user"), "failed to fetch networks: ", err.Error()) diff --git a/logic/auth.go b/logic/auth.go index 371833e9..e6a24608 100644 --- a/logic/auth.go +++ b/logic/auth.go @@ -282,6 +282,9 @@ func UpdateUser(userchange models.User, user models.User) (models.User, error) { user.Password = userchange.Password } + if userchange.IsAdmin != user.IsAdmin { + user.IsAdmin = userchange.IsAdmin + } err := ValidateUser(user) if err != nil {