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

Merge pull request #133 from fileman/PageModuleDeletable

Browse Source 
Page module deletable
This commit is contained in:
Shaun Walker
2019-10-17 09:16:06 -04:00
committed by GitHub
parent 4269ffbe61 76d4be157a
commit d6e35a4ecf
7 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@
public void HideProgressIndicator()
{
progressindicator = true;
progressindicator = false;
StateHasChanged();
}
}

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

@ -117,7 +117,7 @@
}
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
if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))

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

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