Fix - Correction de la gestion des documents sur manage

sheaft-app · Dec 8, 2020 · 646aa09 · 646aa09
1 parent fdc7fc3
commit 646aa09
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Sheaft.Web.Manage/Controllers/DocumentsController.cs b/Sheaft.Web.Manage/Controllers/DocumentsController.cs
@@ -257,6 +257,9 @@ public async Task<IActionResult> DeletePage(Guid documentId, Guid pageId, Cancel
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> Delete(Guid id, CancellationToken token)
         {
+            var entity = await _context.Legals
+                .SingleOrDefaultAsync(c => c.Documents.Any(d => d.Id == id), token);
+
             var result = await _mediatr.Process(new DeleteDocumentCommand(await GetRequestUser(token))
             {
                 Id = id
@@ -265,9 +268,6 @@ public async Task<IActionResult> Delete(Guid id, CancellationToken token)
             if (!result.Success)
                 throw result.Exception;
 
-            var entity = await _context.Legals
-                .SingleOrDefaultAsync(c => c.Documents.Any(d => d.Id == id), token);
-
             if (entity.Kind != LegalKind.Natural)
                 return RedirectToAction("EditLegalBusiness", "Legals", new { entity.Id });
 

diff --git a/Sheaft.Web.Manage/Views/Documents/Edit.cshtml b/Sheaft.Web.Manage/Views/Documents/Edit.cshtml
@@ -27,7 +27,7 @@
         }
     }
 
-    @if (Model.Status == DocumentStatus.Locked || Model.Status == DocumentStatus.Refused || Model.Status == DocumentStatus.OutOfDate)
+    @if (Model.Status == DocumentStatus.Locked)
     {
         @using (Html.BeginForm("Unlock", "Documents", new { id = Model.Id }, FormMethod.Post, true, new { @class = "form d-inline" }))
         {
@@ -149,7 +149,7 @@
                         <th scope="col">Size</th>
                         <th scope="col">UploadedOn</th>
                         <th scope="col">
-                            @if (Model.Status != DocumentStatus.Locked && Model.Status != DocumentStatus.Validated && Model.Status != DocumentStatus.ValidationAsked)
+                            @if (Model.Status == DocumentStatus.Created || Model.Status == DocumentStatus.UnLocked)
                             {
                                 <a asp-controller="Documents" asp-action="AddPage" asp-route-documentid="@Model.Id" class="btn btn-info">
                                     <i class="fa fa-plus"></i>
@@ -173,7 +173,7 @@
                                         <i class="fa fa-download"></i>
                                     </button>
                                 }
-                                @if (Model.Status != DocumentStatus.Locked && Model.Status != DocumentStatus.Validated && Model.Status != DocumentStatus.ValidationAsked)
+                                @if (Model.Status == DocumentStatus.Created || Model.Status == DocumentStatus.UnLocked)
                                 {
                                     @using (Html.BeginForm("DeletePage", "Documents", new { documentId = Model.Id, pageId = docPage.Id }, FormMethod.Post, true, new { @class = "form d-inline" }))
                                     {

diff --git a/Sheaft.Web.Manage/Views/Legals/EditLegalBusiness.cshtml b/Sheaft.Web.Manage/Views/Legals/EditLegalBusiness.cshtml
@@ -223,7 +223,7 @@
                                 </button>
                             }
 
-                            @if (document.Status != DocumentStatus.ValidationAsked && document.Status != DocumentStatus.Validated)
+                            @if (document.Status == DocumentStatus.Created || document.Status == DocumentStatus.Refused)
                             {
                                 @using (Html.BeginForm("Delete", "Documents", new { id = document.Id }, FormMethod.Post, true, new { @class = "form d-inline" }))
                                 {