lmasi/webzine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Rebase) Resolution de merge conflit entre dev et j3/feat/pagination

Browse Source
This commit is contained in:
Loic Masi
2026-04-04 20:11:20 +02:00
parent d82556bf30 9a033a02f1
commit b8ea76218d
29 changed files with 260 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleCreateViewModel.cs
View File

@@ -2,7 +2,7 @@
// Copyright (c) Equipe 1 - BOBIN, MASI, NODON, VETU. All rights reserved.
// </copyright>
namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style
namespace Webzine.WebApplication.Areas.Administration.ViewModels.Styles
{
using System.ComponentModel.DataAnnotations;
@@ -14,7 +14,7 @@ namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style
/// <summary>
/// Obtient ou définit le libellé du style.
/// </summary>
[Required]
[Required(ErrorMessage = "Le libelle du style est obligatoire.")]
public string Libelle { get; set; }
}
}

4
Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleDeleteViewModel.cs
View File

@@ -2,7 +2,7 @@
// Copyright (c) Equipe 1 - BOBIN, MASI, NODON, VETU. All rights reserved.
// </copyright>
namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style
namespace Webzine.WebApplication.Areas.Administration.ViewModels.Styles
{
/// <summary>
/// ViewModel pour la suppression d'un style en administration.
@@ -17,6 +17,6 @@ namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style
/// <summary>
/// Obtient ou définit le libellé du style.
/// </summary>
public string Libelle { get; set; }
public string? Libelle { get; set; }
}
}

4
Webzine.WebApplication/Areas/Administration/ViewModels/Styles/StyleEditViewModel.cs
View File

@@ -2,7 +2,7 @@
// Copyright (c) Equipe 1 - BOBIN, MASI, NODON, VETU. All rights reserved.
// </copyright>
namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style
namespace Webzine.WebApplication.Areas.Administration.ViewModels.Styles
{
using System.ComponentModel.DataAnnotations;
@@ -19,7 +19,7 @@ namespace Webzine.WebApplication.Areas.Administration.ViewModels.Style
/// <summary>
/// Obtient ou definit le libelle du style.
/// </summary>
[Required]
[Required(ErrorMessage = "Le libelle du style est obligatoire.")]
public string Libelle { get; set; }
}
}