Merge pull request #1149 from hargata/Hargata/565

hargata · web-flow · commit d23b16da676f · 2025-11-13T11:10:27.000-07:00
allow for multiple households.
diff --git a/Logic/UserLogic.cs b/Logic/UserLogic.cs
@@ -159,12 +159,9 @@ public bool UserCanEditVehicle(int userId, int vehicleId, HouseholdPermission pe
                 if (userAccess != null && userAccess.Id.UserId == userHousehold.Id.ParentUserId && userAccess.Id.VehicleId == vehicleId)
                 {
                     //every member in a household has permission to view vehicles
-                    if (permission == HouseholdPermission.View)
+                    if (permission == HouseholdPermission.View || userHousehold.Permissions.Contains(permission))
                     {
                         return true;
-                    } else
-                    {
-                        return userHousehold.Permissions.Contains(permission);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,9 @@ public bool UserCanEditVehicle(int userId, int vehicleId, HouseholdPermission pe`
`159`	`159`	`if (userAccess != null && userAccess.Id.UserId == userHousehold.Id.ParentUserId && userAccess.Id.VehicleId == vehicleId)`
`160`	`160`	`{`
`161`	`161`	`//every member in a household has permission to view vehicles`
`162`		`- if (permission == HouseholdPermission.View)`
	`162`	`+ if (permission == HouseholdPermission.View \|\| userHousehold.Permissions.Contains(permission))`
`163`	`163`	`{`
`164`	`164`	`return true;`
`165`		`- } else`
`166`		`- {`
`167`		`- return userHousehold.Permissions.Contains(permission);`
`168`	`165`	`}`
`169`	`166`	`}`
`170`	`167`	`}`