diff --git a/Controllers/newsController.cs b/Controllers/newsController.cs index 07f883e..945836d 100644 --- a/Controllers/newsController.cs +++ b/Controllers/newsController.cs @@ -93,6 +93,7 @@ namespace WebApplication1.Controllers db.SaveChanges(); } + if (news.image == null) { news.image = "_"; } return View(news); } @@ -144,6 +145,7 @@ namespace WebApplication1.Controllers if (!new[] { ".jpg", ".jpeg", ".png" }.Contains(fileExtension)) { ModelState.AddModelError("image", "Only JPG, JPEG, and PNG files are allowed."); + return View(); } else { @@ -190,8 +192,7 @@ namespace WebApplication1.Controllers { if (Session["User"] != null) { - if (Convert.ToInt32(Session["Userrole"]) == 1) - { + if (id == null) { return new HttpStatusCodeResult(HttpStatusCode.BadRequest); @@ -207,11 +208,7 @@ namespace WebApplication1.Controllers } else return new HttpStatusCodeResult(HttpStatusCode.Unauthorized); - } - else - { - return new HttpStatusCodeResult(HttpStatusCode.Unauthorized); - } + } else return RedirectToAction("index", "home"); @@ -239,8 +236,6 @@ namespace WebApplication1.Controllers { if (Session["User"] != null) { - if (Convert.ToInt32(Session["Userrole"]) == 1) - { if (id == null) { return new HttpStatusCodeResult(HttpStatusCode.BadRequest); @@ -256,11 +251,7 @@ namespace WebApplication1.Controllers } else return new HttpStatusCodeResult(HttpStatusCode.Unauthorized); - } - else - { - return new HttpStatusCodeResult(HttpStatusCode.Unauthorized); - } + } else return RedirectToAction("index", "home"); diff --git a/Media/news/AnaSQwnOHg.jpg b/Media/news/AnaSQwnOHg.jpg new file mode 100644 index 0000000..be90bc6 Binary files /dev/null and b/Media/news/AnaSQwnOHg.jpg differ diff --git a/Views/news/Details.cshtml b/Views/news/Details.cshtml index 13d6a2a..c5df213 100644 --- a/Views/news/Details.cshtml +++ b/Views/news/Details.cshtml @@ -24,7 +24,7 @@
- + @Model.title
diff --git a/Views/users/Index.cshtml b/Views/users/Index.cshtml index e366fdd..82f2343 100644 --- a/Views/users/Index.cshtml +++ b/Views/users/Index.cshtml @@ -40,13 +40,19 @@
@Html.ActionLink("edit account details", "Edit", null, new { @class = "btn btn-outline-dark" }) - + @Html.ActionLink("Logout", "LogOut", null, new { @class = "btn btn-outline-dark" }) + + @if (@ViewBag.role == "admin") + { + @Html.ActionLink("Manage users", "allusers", null, new { @class = "btn btn-outline-dark" }) + }

@Html.ActionLink("Delete Account", "Delete", null, new { @class = "btn btn-outline-dark" })
- + + } diff --git a/Views/users/allusers.cshtml b/Views/users/allusers.cshtml index 5d7bbe7..1094a3b 100644 --- a/Views/users/allusers.cshtml +++ b/Views/users/allusers.cshtml @@ -35,7 +35,7 @@ @Html.DisplayFor(modelItem => item.displayname) - @Html.ActionLink("Edit", "Edit", new { id=item.ID }) | + @Html.ActionLink("Edit", "Edituser", new { id=item.ID }) | @Html.ActionLink("Details", "Details", new { id=item.ID }) | @Html.ActionLink("Delete", "Delete", new { id=item.ID })