diff --git a/Yavsc/Controllers/CircleMembersController.cs b/Yavsc/Controllers/CircleMembersController.cs index a3ad7d60..0715dc03 100644 --- a/Yavsc/Controllers/CircleMembersController.cs +++ b/Yavsc/Controllers/CircleMembersController.cs @@ -28,16 +28,13 @@ namespace Yavsc.Controllers } // GET: CircleMembers/Details/5 - public async Task Details(string id) + public async Task Details(long id) { var uid = User.GetUserId(); - if (id == null) - { - return HttpNotFound(); - } CircleMember circleMember = await _context.CircleMembers - .Where(c=>c.Circle.OwnerId == uid).SingleAsync(m => m.MemberId == id); + .Include(m=>m.Circle) + .FirstOrDefaultAsync(c=>c.CircleId == id); if (circleMember == null) { return HttpNotFound(); @@ -77,20 +74,16 @@ namespace Yavsc.Controllers } // GET: CircleMembers/Edit/5 - public async Task Edit(string id) + public async Task Edit(long id) { - if (id == null) - { - return HttpNotFound(); - } - - CircleMember circleMember = await _context.CircleMembers.SingleAsync(m => m.MemberId == id); + var uid = User.GetUserId(); + CircleMember circleMember = await _context.CircleMembers + .Include(m=>m.Member) + .SingleOrDefaultAsync(m => m.CircleId == id && m.MemberId == uid); if (circleMember == null) { return HttpNotFound(); } - ViewData["CircleId"] = new SelectList(_context.Circle, "Id", "Circle", circleMember.CircleId); - ViewData["MemberId"] = new SelectList(_context.Users, "Id", "Member", circleMember.MemberId); return View(circleMember); } @@ -112,14 +105,14 @@ namespace Yavsc.Controllers // GET: CircleMembers/Delete/5 [ActionName("Delete")] - public async Task Delete(string id) + public async Task Delete(long id) { - if (id == null) - { - return HttpNotFound(); - } + var uid = User.GetUserId(); - CircleMember circleMember = await _context.CircleMembers.SingleAsync(m => m.MemberId == id); + CircleMember circleMember = await _context.CircleMembers + .Include(m=>m.Circle) + .Include(m=>m.Member) + .SingleOrDefaultAsync(m => m.CircleId == id && m.MemberId == uid); if (circleMember == null) { return HttpNotFound(); @@ -131,9 +124,9 @@ namespace Yavsc.Controllers // POST: CircleMembers/Delete/5 [HttpPost, ActionName("Delete")] [ValidateAntiForgeryToken] - public async Task DeleteConfirmed(string id) + public async Task DeleteConfirmed(long id) { - CircleMember circleMember = await _context.CircleMembers.SingleAsync(m => m.MemberId == id); + CircleMember circleMember = await _context.CircleMembers.SingleAsync(m => m.CircleId == id); _context.CircleMembers.Remove(circleMember); await _context.SaveChangesAsync(User.GetUserId()); return RedirectToAction("Index"); diff --git a/Yavsc/Views/CircleMembers/Delete.cshtml b/Yavsc/Views/CircleMembers/Delete.cshtml index c28db7fc..eca721ca 100644 --- a/Yavsc/Views/CircleMembers/Delete.cshtml +++ b/Yavsc/Views/CircleMembers/Delete.cshtml @@ -6,17 +6,27 @@

Delete

-

Are you sure you want to delete this?

+

Supprimer cette appartenance au cercle?

-

CircleMember


-
+
+
+Cercle +
+
+@Html.DisplayFor(m=>m.Circle) +
+
+Membre +
+
+@Html.DisplayFor(m=>m.Member) +
- -
-
- | - Back to List -
-
+
+
+ | + Back to List +
+
diff --git a/Yavsc/Views/CircleMembers/Details.cshtml b/Yavsc/Views/CircleMembers/Details.cshtml index 9573e287..f6198ece 100644 --- a/Yavsc/Views/CircleMembers/Details.cshtml +++ b/Yavsc/Views/CircleMembers/Details.cshtml @@ -1,18 +1,17 @@ @model CircleMember @{ - ViewData["Title"] = "Details"; + ViewData["Title"] = $"{Model.Member.UserName}, du cercle {Model.Circle.Name}" ; } -

Details

+

-

CircleMember

+

Un membre du cercle @Model.Circle.Name


-
-
+ @Html.DisplayFor(m=>Model.Member)

- @Html.ActionLink("Edit", "Edit", new { /* id = Model.PrimaryKey */ }) | - Back to List + @Html.ActionLink(SR["Delete"], "Delete", new { id = Model.CircleId }) | + @SR["Back to List"]

diff --git a/Yavsc/Views/CircleMembers/Edit.cshtml b/Yavsc/Views/CircleMembers/Edit.cshtml index 7157e29f..7926a031 100644 --- a/Yavsc/Views/CircleMembers/Edit.cshtml +++ b/Yavsc/Views/CircleMembers/Edit.cshtml @@ -8,7 +8,7 @@
-

CircleMember

+

Circle Member


@@ -22,6 +22,6 @@ diff --git a/Yavsc/Views/CircleMembers/Index.cshtml b/Yavsc/Views/CircleMembers/Index.cshtml index 6f3ba67e..7664b30e 100644 --- a/Yavsc/Views/CircleMembers/Index.cshtml +++ b/Yavsc/Views/CircleMembers/Index.cshtml @@ -17,6 +17,10 @@ @foreach (var item in Model) { + + var itemKey = new { Id = item.CircleId } ; + + @Html.DisplayFor(m=>item.Circle) @@ -26,9 +30,7 @@ - @Html.ActionLink("Edit", "Edit", new { /* id=item.PrimaryKey */ }) | - @Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) | - @Html.ActionLink("Delete", "Delete", new { /* id=item.PrimaryKey */ }) + @Html.ActionLink("Delete", "Delete", itemKey) }