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

authorization changes

Browse Source
This commit is contained in:
Shaun Walker
2020-02-17 19:48:26 -05:00
parent 2fa7f852d5
commit 066c616eca
44 changed files with 880 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -125,6 +125,7 @@ else
Dictionary<string, string> panelayouts = new Dictionary<string, string>();
Dictionary<string, string> containers = new Dictionary<string, string>();
List<Theme> Themes;
List<Tenant> tenants;
string tenantid = "-1";
string name = "";
@ -139,10 +140,11 @@ else
protected override async Task OnInitializedAsync()
{
Themes = await ThemeService.GetThemesAsync();
tenants = await TenantService.GetTenantsAsync();
urls = PageState.Alias.Name;
themes = ThemeService.GetThemeTypes(PageState.Themes);
containers = ThemeService.GetContainerTypes(PageState.Themes);
themes = ThemeService.GetThemeTypes(Themes);
containers = ThemeService.GetContainerTypes(Themes);
username = Constants.HostUser;
}
@ -175,7 +177,7 @@ else
themetype = (string)e.Value;
if (themetype != "")
{
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes, themetype);
panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
}
else
{

16
Oqtane.Client/Modules/Admin/Sites/Edit.razor
View File

@ -157,6 +157,7 @@
Dictionary<string, string> panelayouts;
Dictionary<string, string> containers;
List<Theme> Themes;
Alias Alias;
int siteid;
string name = "";
@ -186,14 +187,15 @@
{
try
{
Alias = PageState.Aliases.Where(item => item.AliasId == Int32.Parse(PageState.QueryString["id"])).FirstOrDefault();
Themes = await ThemeService.GetThemesAsync();
aliases = await AliasService.GetAliasesAsync();
Alias = aliases.Where(item => item.AliasId == int.Parse(PageState.QueryString["id"])).FirstOrDefault();
siteid = Alias.SiteId;
Site site = await SiteService.GetSiteAsync(siteid, Alias);
if (site != null)
{
name = site.Name;
aliases = PageState.Aliases.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList();
foreach (Alias alias in aliases)
foreach (Alias alias in aliases.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
{
urls += alias.Name + "\n";
}
@ -202,7 +204,7 @@
logofileid = site.LogoFileId.Value;
}
themetype = site.DefaultThemeType;
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes, themetype);
panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
layouttype = site.DefaultLayoutType;
containertype = site.DefaultContainerType;
@ -222,8 +224,8 @@
isdeleted = site.IsDeleted.ToString();
}
themes = ThemeService.GetThemeTypes(PageState.Themes);
containers = ThemeService.GetContainerTypes(PageState.Themes);
themes = ThemeService.GetThemeTypes(Themes);
containers = ThemeService.GetContainerTypes(Themes);
}
catch (Exception ex)
{
@ -239,7 +241,7 @@
themetype = (string)e.Value;
if (themetype != "")
{
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes, themetype);
panelayouts = ThemeService.GetPaneLayoutTypes(Themes, themetype);
}
else
{

5
Oqtane.Client/Modules/Admin/Sites/Index.razor
View File

@ -32,13 +32,14 @@ else
List<Alias> sites;
string scheme;
protected override void OnParametersSet()
protected override async Task OnParametersSetAsync()
{
Uri uri = new Uri(NavigationManager.Uri);
scheme = uri.Scheme + "://";
List<Alias> aliases = await AliasService.GetAliasesAsync();
sites = new List<Alias>();
foreach (Alias alias in PageState.Aliases.OrderBy(item => item.Name))
foreach (Alias alias in aliases)
{
if (!sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
{