Skip to content
Snippets Groups Projects
Commit c66480c2 authored by Odin Aas's avatar Odin Aas :cry:
Browse files

Merge branch 'overview' into 'dev-branch'

Overview

See merge request !60
parents e0059f95 fd82303a
Branches
No related tags found
2 merge requests!66Dev branch,!60Overview
Pipeline #26060 passed
......@@ -33,7 +33,7 @@ func NewUser(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusInternalServerError)
return
}
if permissionLevel != 0 {
if permissionLevel != 0 || userData.User.Permission > 3 || userData.User.Permission < 0 {
w.WriteHeader(http.StatusUnauthorized)
return
}
......
......@@ -207,7 +207,7 @@ func setIntoDatasets(Machines []other.MachineDetails) other.OverviewData {
for idx, building := range oData.Buildings {
if machine.Building.Name == building.Name {
if !containsDepartment(machine.Department.Name, building.Departments) {
if machine.Department.Name == "" {
if machine.Department.Name == "" && !containsDepartment("No department", building.Departments) {
oData.Buildings[idx].Departments = append(building.Departments, other.ODepartment{Name: "No department"})
} else {
oData.Buildings[idx].Departments = append(building.Departments, other.ODepartment{Name: machine.Department.Name})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment