kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #139 from fileman/ContentPanelFix

Browse Source 
Content panel fix
This commit is contained in:
Shaun Walker 2019-10-18 17:34:31 -04:00 committed by GitHub
commit 75528d86cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Oqtane.Client/Themes/Controls/ControlPanel.razor
View File

@ -48,7 +48,7 @@
} }
</select> </select>
<select class="form-control" @bind="@moduledefinitionname"> <select class="form-control" @bind="@moduledefinitionname">
<option value="">&lt;Select Module&gt;</option> <option value="-">&lt;Select Module&gt;</option>
@foreach (var moduledefinition in moduledefinitions) @foreach (var moduledefinition in moduledefinitions)
{ {
if (moduledefinition.Permissions == "[]" || UserSecurity.IsAuthorized(PageState.User, "Utilize", moduledefinition.Permissions)) if (moduledefinition.Permissions == "[]" || UserSecurity.IsAuthorized(PageState.User, "Utilize", moduledefinition.Permissions))
@ -69,7 +69,7 @@
} }
</select> </select>
<select class="form-control" @bind="@moduleid"> <select class="form-control" @bind="@moduleid">
<option value="">&lt;Select Module&gt;</option> <option value="-">&lt;Select Module&gt;</option>
@foreach (Module module in modules) @foreach (Module module in modules)
{ {
<option value="@module.ModuleId">@module.Title</option> <option value="@module.ModuleId">@module.Title</option>
@ -148,11 +148,12 @@
string moduletype = "new"; string moduletype = "new";
List<string> categories = new List<string>(); List<string> categories = new List<string>();
List<ModuleDefinition> moduledefinitions; List<ModuleDefinition> moduledefinitions;
List<Page> pages = new List<Page>(); List<Page> pages;
string moduleid = ""; string pageid = "";
string moduleid = "-";
List<Module> modules = new List<Module>(); List<Module> modules = new List<Module>();
Dictionary<string, string> containers = new Dictionary<string, string>(); Dictionary<string, string> containers = new Dictionary<string, string>();
string moduledefinitionname = ""; string moduledefinitionname = "-";
string pane = ""; string pane = "";
string title = ""; string title = "";
string containertype = ""; string containertype = "";
@ -174,6 +175,8 @@
if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions)) if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions))
{ {
pages = new List<Page>();
foreach (ModuleDefinition moduledefinition in PageState.ModuleDefinitions) foreach (ModuleDefinition moduledefinition in PageState.ModuleDefinitions)
{ {
if (moduledefinition.Categories != "") if (moduledefinition.Categories != "")
@ -213,16 +216,16 @@
{ {
moduledefinitions = PageState.ModuleDefinitions.Where(item => item.Categories.Contains(e.Value.ToString())).ToList(); moduledefinitions = PageState.ModuleDefinitions.Where(item => item.Categories.Contains(e.Value.ToString())).ToList();
} }
moduledefinitionname = ""; moduledefinitionname = "-";
StateHasChanged(); StateHasChanged();
} }
private void PageChanged(ChangeEventArgs e) private void PageChanged(ChangeEventArgs e)
{ {
string pageid = (string)e.Value; pageid = (string)e.Value;
if (pageid != "") if (pageid != "")
{ {
foreach(Module module in PageState.Modules.Where(item => item.PageId == int.Parse(pageid))) foreach(Module module in PageState.Modules.Where(item => item.PageId == int.Parse(pageid) && !item.IsDeleted))
{ {
if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions)) if (UserSecurity.IsAuthorized(PageState.User, "View", module.Permissions))
{ {
@ -230,7 +233,7 @@
} }
} }
} }
moduleid = ""; moduleid = "-";
StateHasChanged(); StateHasChanged();
} }
@ -249,7 +252,7 @@
} }
PageModule pagemodule = new PageModule(); PageModule pagemodule = new PageModule();
pagemodule.PageId = PageState.Page.PageId; pagemodule.PageId = string.IsNullOrWhiteSpace(pageid) ? PageState.Page.PageId : int.Parse(pageid);
pagemodule.ModuleId = int.Parse(moduleid); pagemodule.ModuleId = int.Parse(moduleid);
pagemodule.Title = title; pagemodule.Title = title;
if (pagemodule.Title == "") if (pagemodule.Title == "")
@ -277,6 +280,12 @@
message = "<br /><div class=\"alert alert-success\" role=\"alert\">Module Added To Page</div>"; message = "<br /><div class=\"alert alert-success\" role=\"alert\">Module Added To Page</div>";
moduledefinitionname = "-";
pane = "";
title = "";
containertype = "";
moduleid = "-";
NavigationManager.NavigateTo(NavigateUrl(Reload.Page)); NavigationManager.NavigateTo(NavigateUrl(Reload.Page));
} }
} }