diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor index 6b01b72c..aaeb5e63 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor @@ -51,7 +51,7 @@ - @@ -95,10 +95,13 @@ - + - + @@ -106,7 +109,7 @@ Cancel

- + @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } @@ -128,6 +131,9 @@ DateTime createdon; string modifiedby; DateTime modifiedon; + string deletedby; + DateTime? deletedon; + string isdeleted; PermissionGrid permissiongrid; @@ -154,6 +160,9 @@ createdon = page.CreatedOn; modifiedby = page.ModifiedBy; modifiedon = page.ModifiedOn; + deletedby = page.DeletedBy; + deletedon = page.DeletedOn; + isdeleted = page.IsDeleted.ToString(); } } catch (Exception ex) diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index a40fa3b3..ed070e91 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -138,12 +138,23 @@ + + + + + + + + Cancel

- + @code { public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } } @@ -170,6 +181,9 @@ DateTime createdon; string modifiedby; DateTime modifiedon; + string deletedby; + DateTime? deletedon; + string isdeleted; PermissionGrid permissiongrid; @@ -212,6 +226,9 @@ createdon = page.CreatedOn; modifiedby = page.ModifiedBy; modifiedon = page.ModifiedOn; + deletedby = page.DeletedBy; + deletedon = page.DeletedOn; + isdeleted = page.IsDeleted.ToString(); } } catch (Exception ex) @@ -321,6 +338,8 @@ System.Reflection.PropertyInfo property = type.GetProperty("Panes"); page.Panes = (string)property.GetValue(Activator.CreateInstance(type), null); page.Permissions = permissiongrid.GetPermissions(); + page.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted)); + await PageService.UpdatePageAsync(page); await PageService.UpdatePageOrderAsync(page.SiteId, page.ParentId); if (currentparentid == "") diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor index 4840dc54..40938da3 100644 --- a/Oqtane.Client/Modules/Controls/AuditInfo.razor +++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor @@ -18,6 +18,15 @@ [Parameter] public DateTime ModifiedOn { get; set; } + + [Parameter] + public string DeletedBy { get; set; } + + [Parameter] + public DateTime? DeletedOn { get; set; } + + [Parameter] + public bool IsDeleted { get; set; } [Parameter] public string Style { get; set; } @@ -54,5 +63,19 @@ } text += "

"; } + + if (!String.IsNullOrEmpty(DeletedBy) || DeletedOn.HasValue) + { + text += "

Deleted "; + if (!String.IsNullOrEmpty(DeletedBy)) + { + text += " by " + DeletedBy + ""; + } + if (DeletedOn != null) + { + text += " on " + DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + ""; + } + text += "

"; + } } } diff --git a/Oqtane.Client/Themes/Controls/Menu.razor b/Oqtane.Client/Themes/Controls/Menu.razor index fe380160..271ab3e1 100644 --- a/Oqtane.Client/Themes/Controls/Menu.razor +++ b/Oqtane.Client/Themes/Controls/Menu.razor @@ -17,7 +17,7 @@ menu = "