diff --git a/Webzine.Repository/DbStyleRepository.cs b/Webzine.Repository/DbStyleRepository.cs index 0412a90..57f42f3 100644 --- a/Webzine.Repository/DbStyleRepository.cs +++ b/Webzine.Repository/DbStyleRepository.cs @@ -94,7 +94,6 @@ public class DbStyleRepository : IStyleRepository this.logger.LogDebug("Recherche du style avec l'ID: {Id}", id); var style = this.context.Styles - .AsNoTracking() .Include(s => s.Titres) .SingleOrDefault(s => s.IdStyle == id); @@ -123,7 +122,6 @@ public class DbStyleRepository : IStyleRepository this.logger.LogDebug("Tri des styles par libellé"); var styles = this.context.Styles - .AsNoTracking() .OrderBy(s => s.Libelle); this.logger.LogDebug("La liste de styles a été récupérée."); diff --git a/Webzine.WebApplication/Areas/Administration/Controllers/ArtisteController.cs b/Webzine.WebApplication/Areas/Administration/Controllers/ArtisteController.cs index c68e99e..4d4311a 100644 --- a/Webzine.WebApplication/Areas/Administration/Controllers/ArtisteController.cs +++ b/Webzine.WebApplication/Areas/Administration/Controllers/ArtisteController.cs @@ -97,12 +97,15 @@ public class ArtisteController : Controller [HttpPost] public IActionResult Edit(ArtisteEditViewModel model) { - var artiste = new Artiste + var artiste = this.artisteRepository.Find(model.Id); + + if (artiste == null) { - IdArtiste = model.Id, - Nom = model.Nom, - Biographie = model.Biographie, - }; + return this.RedirectToAction("Index"); + } + + artiste.Nom = model.Nom; + artiste.Biographie = model.Biographie; this.artisteRepository.Update(artiste); diff --git a/Webzine.WebApplication/Areas/Administration/Controllers/StyleController.cs b/Webzine.WebApplication/Areas/Administration/Controllers/StyleController.cs index 578cf4d..cb08beb 100644 --- a/Webzine.WebApplication/Areas/Administration/Controllers/StyleController.cs +++ b/Webzine.WebApplication/Areas/Administration/Controllers/StyleController.cs @@ -2,9 +2,11 @@ namespace Webzine.WebApplication.Areas.Administration.Controllers; using Microsoft.AspNetCore.Mvc; +using ViewModels.Styles; + using Webzine.Entity; using Webzine.Repository.Contracts; -using Webzine.WebApplication.Areas.Administration.ViewModels.Style; +using Webzine.WebApplication.Areas.Administration.ViewModels.Styles; /// /// Controleur pour la gestion des styles dans l'administration du webzine. diff --git a/Webzine.WebApplication/Areas/Administration/ViewModels/Artiste/AdminArtisteForm.cs b/Webzine.WebApplication/Areas/Administration/ViewModels/Artiste/AdminArtisteForm.cs index c1700cb..ee14731 100644 --- a/Webzine.WebApplication/Areas/Administration/ViewModels/Artiste/AdminArtisteForm.cs +++ b/Webzine.WebApplication/Areas/Administration/ViewModels/Artiste/AdminArtisteForm.cs @@ -14,11 +14,11 @@ /// /// Définit le nom de l'artiste. /// - public string Nom { get; set; } + public string? Nom { get; set; } /// /// Définit la biographie de l'artiste. /// - public string Biographie { get; set; } + public string? Biographie { get; set; } } } \ No newline at end of file diff --git a/Webzine.WebApplication/Areas/Administration/ViewModels/Artiste/ArtisteEditViewModel.cs b/Webzine.WebApplication/Areas/Administration/ViewModels/Artiste/ArtisteEditViewModel.cs index 0d34c6f..98b3887 100644 --- a/Webzine.WebApplication/Areas/Administration/ViewModels/Artiste/ArtisteEditViewModel.cs +++ b/Webzine.WebApplication/Areas/Administration/ViewModels/Artiste/ArtisteEditViewModel.cs @@ -20,11 +20,7 @@ [StringLength(50, ErrorMessage = "Le nom ne doit pas dépasser 50 caractères.")] public string Nom { get; set; } - - /// - /// Biographie de l'artiste. - /// - [Required(ErrorMessage = "Le contenu de la biographie ne peut pas être vide.")] + public string Biographie { get; set; } } } \ No newline at end of file diff --git a/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleCreateViewModel.cs b/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleCreateViewModel.cs index 2eba907..de912e7 100644 --- a/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleCreateViewModel.cs +++ b/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleCreateViewModel.cs @@ -2,7 +2,7 @@ // Copyright (c) Equipe 1 - BOBIN, MASI, NODON, VETU. All rights reserved. // -namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style +namespace Webzine.WebApplication.Areas.Administration.ViewModels.Styles { using System.ComponentModel.DataAnnotations; diff --git a/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleDeleteViewModel.cs b/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleDeleteViewModel.cs index fc94e54..daade0d 100644 --- a/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleDeleteViewModel.cs +++ b/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleDeleteViewModel.cs @@ -2,7 +2,7 @@ // Copyright (c) Equipe 1 - BOBIN, MASI, NODON, VETU. All rights reserved. // -namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style +namespace Webzine.WebApplication.Areas.Administration.ViewModels.Styles { /// /// ViewModel pour la suppression d'un style en administration. @@ -17,6 +17,6 @@ namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style /// /// Obtient ou définit le libellé du style. /// - public string Libelle { get; set; } + public string? Libelle { get; set; } } } \ No newline at end of file diff --git a/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleEditViewModel.cs b/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleEditViewModel.cs index 671098c..b959456 100644 --- a/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleEditViewModel.cs +++ b/Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleEditViewModel.cs @@ -2,7 +2,7 @@ // Copyright (c) Equipe 1 - BOBIN, MASI, NODON, VETU. All rights reserved. // -namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style +namespace Webzine.WebApplication.Areas.Administration.ViewModels.Styles { using System.ComponentModel.DataAnnotations; diff --git a/Webzine.WebApplication/Areas/Administration/Views/Style/Create.cshtml b/Webzine.WebApplication/Areas/Administration/Views/Style/Create.cshtml index c0cb8f7..ddc0c14 100644 --- a/Webzine.WebApplication/Areas/Administration/Views/Style/Create.cshtml +++ b/Webzine.WebApplication/Areas/Administration/Views/Style/Create.cshtml @@ -1,4 +1,4 @@ -@model Webzine.WebApplication.Areas.Administration.ViewModels.Style.StyleCreateViewModel +@model Webzine.WebApplication.Areas.Administration.ViewModels.Styles.StyleCreateViewModel @{ ViewData["Title"] = "Créer un style"; diff --git a/Webzine.WebApplication/Areas/Administration/Views/Style/Delete.cshtml b/Webzine.WebApplication/Areas/Administration/Views/Style/Delete.cshtml index 47dad12..61dce02 100644 --- a/Webzine.WebApplication/Areas/Administration/Views/Style/Delete.cshtml +++ b/Webzine.WebApplication/Areas/Administration/Views/Style/Delete.cshtml @@ -1,4 +1,4 @@ -@model Webzine.WebApplication.Areas.Administration.ViewModels.Style.StyleDeleteViewModel +@model Webzine.WebApplication.Areas.Administration.ViewModels.Styles.StyleDeleteViewModel @{ ViewData["Title"] = "Supprimer un style"; diff --git a/Webzine.WebApplication/Areas/Administration/Views/Style/Edit.cshtml b/Webzine.WebApplication/Areas/Administration/Views/Style/Edit.cshtml index 446cabe..bf57f66 100644 --- a/Webzine.WebApplication/Areas/Administration/Views/Style/Edit.cshtml +++ b/Webzine.WebApplication/Areas/Administration/Views/Style/Edit.cshtml @@ -1,4 +1,4 @@ -@model Webzine.WebApplication.Areas.Administration.ViewModels.Style.StyleEditViewModel +@model Webzine.WebApplication.Areas.Administration.ViewModels.Styles.StyleEditViewModel @{ ViewData["Title"] = "Editer un style"; diff --git a/Webzine.WebApplication/Program.cs b/Webzine.WebApplication/Program.cs index 32c3737..4fcbc78 100644 --- a/Webzine.WebApplication/Program.cs +++ b/Webzine.WebApplication/Program.cs @@ -30,8 +30,8 @@ try // controllers avec des vues. builder.Services.AddControllersWithViews(options => { + // options.Filters.Add(); options.Filters.Add(); - options.Filters.Add(); }) // Ajoute la compilation des vues lors de l'execution de l'application.