gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-17 22:48:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1728 from gravitl/release_v0.16.3

Browse source 
Release v0.16.3
This commit is contained in:
dcarns 2022-11-10 15:52:05 -05:00 • committed by GitHub
commit fbc6008c0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/ext_client.go
View file

@ -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())

2
controllers/network.go
View file

@ -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())

3
logic/auth.go
View file

@ -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 {