Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Move IsDeleted condition into Pane.razor, restore themes razor and css files

Browse Source
This commit is contained in:
Emanuele Filardo
2019-10-17 11:41:08 +02:00
parent 31d67e3a0e
commit 76d4be157a
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Shared/Pane.razor
View File

@ -117,7 +117,7 @@
} }
else else
{ {
foreach (Module module in PageState.Modules.Where(item => item.Pane.ToLower() == Name.ToLower()).OrderBy(x => x.Order).ToArray()) foreach (Module module in PageState.Modules.Where(item => item.Pane.ToLower() == Name.ToLower() && !item.IsDeleted).OrderBy(x => x.Order).ToArray())
{ {
// check if user is authorized to view module // check if user is authorized to view module
if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions)) if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))

5
Oqtane.Client/Themes/Controls/ModuleActions.razor
View File

@ -23,7 +23,7 @@
} }
@code { @code {
List<ActionViewModel> actions; List<ActionViewModel> actions;
protected override void OnParametersSet() protected override void OnParametersSet()
{ {
@ -103,7 +103,8 @@
url = EditUrl(pagemodule.ModuleId, "Export"); url = EditUrl(pagemodule.ModuleId, "Export");
break; break;
case "delete": case "delete":
await PageModuleService.DeletePageModuleAsync(pagemodule.PageModuleId); pagemodule.IsDeleted = true;
await PageModuleService.UpdatePageModuleAsync(pagemodule);
await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane); await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
break; break;
default: // move to pane default: // move to pane

1
Oqtane.Server/Controllers/ModuleController.cs
View File

@ -47,6 +47,7 @@ namespace Oqtane.Controllers
module.CreatedOn = pagemodule.Module.CreatedOn; module.CreatedOn = pagemodule.Module.CreatedOn;
module.ModifiedBy = pagemodule.Module.ModifiedBy; module.ModifiedBy = pagemodule.Module.ModifiedBy;
module.ModifiedOn = pagemodule.Module.ModifiedOn; module.ModifiedOn = pagemodule.Module.ModifiedOn;
module.IsDeleted = pagemodule.IsDeleted;
module.PageModuleId = pagemodule.PageModuleId; module.PageModuleId = pagemodule.PageModuleId;
module.ModuleId = pagemodule.ModuleId; module.ModuleId = pagemodule.ModuleId;

3
Oqtane.Shared/Models/Module.cs
View File

@ -16,6 +16,9 @@ namespace Oqtane.Models
public string ModifiedBy { get; set; } public string ModifiedBy { get; set; }
public DateTime ModifiedOn { get; set; } public DateTime ModifiedOn { get; set; }
[NotMapped]
public bool IsDeleted { get; set; }
[NotMapped] [NotMapped]
public string Permissions { get; set; } public string Permissions { get; set; }