diff --git a/Controllers/Vehicle/ReportController.cs b/Controllers/Vehicle/ReportController.cs index 6671c13..a003762 100644 --- a/Controllers/Vehicle/ReportController.cs +++ b/Controllers/Vehicle/ReportController.cs @@ -183,7 +183,7 @@ namespace CarCareTracker.Controllers Collaborators = result, CanModifyCollaborators = userCanModify }; - return PartialView("_Collaborators", result); + return PartialView("_Collaborators", viewModel); } [TypeFilter(typeof(CollaboratorFilter))] [HttpPost] diff --git a/Views/Vehicle/_Collaborators.cshtml b/Views/Vehicle/_Collaborators.cshtml index 7a4ce8f..a502eea 100644 --- a/Views/Vehicle/_Collaborators.cshtml +++ b/Views/Vehicle/_Collaborators.cshtml @@ -21,21 +21,27 @@ - - + + @if (Model.CanModifyCollaborators) + { + + } @foreach (UserCollaborator user in Model.Collaborators) { - - + + @if (Model.CanModifyCollaborators) + { + + } } diff --git a/wwwroot/js/garage.js b/wwwroot/js/garage.js index 4cfe229..44e80ec 100644 --- a/wwwroot/js/garage.js +++ b/wwwroot/js/garage.js @@ -588,6 +588,7 @@ function hideHouseholdModal() { function removeUserFromHousehold(userId) { $.post('/Home/RemoveUserFromHousehold', { userId: userId }, function (data) { if (data) { + successToast('User Removed'); showHouseholdModal(); } else { errorToast(genericErrorMessage()) @@ -614,6 +615,7 @@ function addUserToHousehold() { $.post('/Home/AddUserToHousehold', { username: result.value.userName }, function (data) { if (data.success) { showHouseholdModal(); + successToast('User Added'); } else { errorToast(data.message); }
@translator.Translate(userLanguage, "Username")@translator.Translate(userLanguage, "Delete")@translator.Translate(userLanguage, "Username")@translator.Translate(userLanguage, "Delete")
@user.UserName - @if(User.Identity.Name != user.UserName && Model.CanModifyCollaborators) - { - - } - @user.UserName + @if (User.Identity.Name != user.UserName && Model.CanModifyCollaborators) + { + + } +