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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Shaun Walker
2020-03-19 12:10:12 -04:00
committed by GitHub
parent 18a843e74f ee42db7c39
commit 0c2d1d2449
16 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Files/Edit.razor
View File

@ -36,7 +36,7 @@
<label class="control-label">Permissions: </label>
</td>
<td>
<PermissionGrid EntityName="Folder" PermissionNames="Browse,View,Edit" Permissions="@_permissions" @ref="_permissionGrid" />
<PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="Browse,View,Edit" Permissions="@_permissions" @ref="_permissionGrid" />
</td>
</tr>
</table>

2
Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
View File

@ -17,7 +17,7 @@
<label class="control-label">Permissions: </label>
</td>
<td>
<PermissionGrid EntityName="ModuleDefinition" PermissionNames=PermissionNames.Utilize Permissions="@_permissions" @ref="_permissionGrid" />
<PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames=PermissionNames.Utilize Permissions="@_permissions" @ref="_permissionGrid" />
</td>
</tr>
</table>

2
Oqtane.Client/Modules/Admin/Modules/Settings.razor
View File

@ -34,7 +34,7 @@
<label for="Name" class="control-label">Permissions: </label>
</td>
<td>
<PermissionGrid EntityName="Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
<PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
</td>
</tr>
<tr>

2
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -137,7 +137,7 @@
<label for="Name" class="control-label">Permissions: </label>
</td>
<td>
<PermissionGrid EntityName="Page" Permissions="@_permissions" @ref="_permissionGrid" />
<PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
</td>
</tr>
</table>

2
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -155,7 +155,7 @@
<label for="Name" class="control-label">Permissions: </label>
</td>
<td>
<PermissionGrid EntityName="Page" Permissions="@_permissions" @ref="_permissionGrid" />
<PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
</td>
</tr>
</table>

2
Oqtane.Client/Services/FolderService.cs
View File

@ -24,7 +24,7 @@ namespace Oqtane.Services
_navigationManager = navigationManager;
}
private string ApiUrl => CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "Folder");
private string ApiUrl => CreateApiUrl(_siteState.Alias, _navigationManager.Uri, EntityNames.Folder);
public async Task<List<Folder>> GetFoldersAsync(int siteId)
{

2
Oqtane.Client/Services/ModuleDefinitionService.cs
View File

@ -28,7 +28,7 @@ namespace Oqtane.Services
private string Apiurl
{
get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "ModuleDefinition"); }
get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, EntityNames.ModuleDefinition); }
}
public async Task<List<ModuleDefinition>> GetModuleDefinitionsAsync(int siteId)

28
Oqtane.Client/Services/SettingService.cs
View File

@ -28,72 +28,72 @@ namespace Oqtane.Services
public async Task<Dictionary<string, string>> GetHostSettingsAsync()
{
return await GetSettingsAsync("Host", -1);
return await GetSettingsAsync(EntityNames.Host, -1);
}
public async Task UpdateHostSettingsAsync(Dictionary<string, string> hostSettings)
{
await UpdateSettingsAsync(hostSettings, "Host", -1);
await UpdateSettingsAsync(hostSettings, EntityNames.Host, -1);
}
public async Task<Dictionary<string, string>> GetSiteSettingsAsync(int siteId)
{
return await GetSettingsAsync("Site", siteId);
return await GetSettingsAsync(EntityNames.Site, siteId);
}
public async Task UpdateSiteSettingsAsync(Dictionary<string, string> siteSettings, int siteId)
{
await UpdateSettingsAsync(siteSettings, "Site", siteId);
await UpdateSettingsAsync(siteSettings, EntityNames.Site, siteId);
}
public async Task<Dictionary<string, string>> GetPageSettingsAsync(int pageId)
{
return await GetSettingsAsync("Page", pageId);
return await GetSettingsAsync(EntityNames.Page, pageId);
}
public async Task UpdatePageSettingsAsync(Dictionary<string, string> pageSettings, int pageId)
{
await UpdateSettingsAsync(pageSettings, "Page", pageId);
await UpdateSettingsAsync(pageSettings, EntityNames.Page, pageId);
}
public async Task<Dictionary<string, string>> GetPageModuleSettingsAsync(int pageModuleId)
{
return await GetSettingsAsync("PageModule", pageModuleId);
return await GetSettingsAsync(EntityNames.PageModule, pageModuleId);
}
public async Task UpdatePageModuleSettingsAsync(Dictionary<string, string> pageModuleSettings, int pageModuleId)
{
await UpdateSettingsAsync(pageModuleSettings, "PageModule", pageModuleId);
await UpdateSettingsAsync(pageModuleSettings, EntityNames.PageModule, pageModuleId);
}
public async Task<Dictionary<string, string>> GetModuleSettingsAsync(int moduleId)
{
return await GetSettingsAsync("Module", moduleId);
return await GetSettingsAsync(EntityNames.Module, moduleId);
}
public async Task UpdateModuleSettingsAsync(Dictionary<string, string> moduleSettings, int moduleId)
{
await UpdateSettingsAsync(moduleSettings, "Module", moduleId);
await UpdateSettingsAsync(moduleSettings, EntityNames.Module, moduleId);
}
public async Task<Dictionary<string, string>> GetUserSettingsAsync(int userId)
{
return await GetSettingsAsync("User", userId);
return await GetSettingsAsync(EntityNames.User, userId);
}
public async Task UpdateUserSettingsAsync(Dictionary<string, string> userSettings, int userId)
{
await UpdateSettingsAsync(userSettings, "User", userId);
await UpdateSettingsAsync(userSettings, EntityNames.User, userId);
}
public async Task<Dictionary<string, string>> GetFolderSettingsAsync(int folderId)
{
return await GetSettingsAsync("Folder", folderId);
return await GetSettingsAsync( EntityNames.Folder, folderId);
}
public async Task UpdateFolderSettingsAsync(Dictionary<string, string> folderSettings, int folderId)
{
await UpdateSettingsAsync(folderSettings, "Folder", folderId);
await UpdateSettingsAsync(folderSettings, EntityNames.Folder, folderId);
}
public async Task<Dictionary<string, string>> GetSettingsAsync(string entityName, int entityId)

6
Oqtane.Client/UI/SiteRouter.razor
View File

@ -116,11 +116,11 @@
// process any sync events for site or page
if (reload != Reload.Site && alias.SyncEvents.Any())
{
if (PageState != null && alias.SyncEvents.Exists(item => item.EntityName == "Page" && item.EntityId == PageState.Page.PageId))
if (PageState != null && alias.SyncEvents.Exists(item => item.EntityName == EntityNames.Page && item.EntityId == PageState.Page.PageId))
{
reload = Reload.Page;
}
if (alias.SyncEvents.Exists(item => item.EntityName == "Site" && item.EntityId == alias.SiteId))
if (alias.SyncEvents.Exists(item => item.EntityName == EntityNames.Site && item.EntityId == alias.SiteId))
{
reload = Reload.Site;
}
@ -154,7 +154,7 @@
// process any sync events for user
if (reload != Reload.Site && user != null && alias.SyncEvents.Any())
{
if (alias.SyncEvents.Exists(item => item.EntityName == "User" && item.EntityId == user.UserId))
if (alias.SyncEvents.Exists(item => item.EntityName == EntityNames.User && item.EntityId == user.UserId))
{
reload = Reload.Site;
}