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

Naming fixes

Browse Source
This commit is contained in:
Pavel Vesely
2020-03-14 09:54:48 +01:00
parent 52e31c42f6
commit a06ad38432
34 changed files with 467 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,20 +3,20 @@
@inject IFolderService FolderService
@inject NavigationManager NavigationManager
@if (folders != null)
@if (_folders != null)
{
<table class="table table-borderless">
<tr>
<td>
<label for="Name" class="control-label">Parent: </label>
<label class="control-label">Parent: </label>
</td>
<td>
<select class="form-control" @bind="@parentid">
<select class="form-control" @bind="@_parentId">
@if (PageState.QueryString.ContainsKey("id"))
{
<option value="-1">&lt;No Parent&gt;</option>
}
@foreach (Folder folder in folders)
@foreach (Folder folder in _folders)
{
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
}
@ -25,27 +25,27 @@
</tr>
<tr>
<td>
<label for="Name" class="control-label">Name: </label>
<label class="control-label">Name: </label>
</td>
<td>
<input class="form-control" @bind="@name" />
<input class="form-control" @bind="@_name" />
</td>
</tr>
<tr>
<td>
<label for="Name" class="control-label">Permissions: </label>
<label class="control-label">Permissions: </label>
</td>
<td>
<PermissionGrid EntityName="Folder" PermissionNames="Browse,View,Edit" Permissions="@permissions" @ref="permissiongrid" />
<PermissionGrid EntityName="Folder" PermissionNames="Browse,View,Edit" Permissions="@_permissions" @ref="permissiongrid" />
</td>
</tr>
</table>
@if (!issystem)
@if (!_isSystem)
{
<button type="button" class="btn btn-success" @onclick="SaveFolder">Save</button>
}
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@if (!issystem && PageState.QueryString.ContainsKey("id"))
@if (!_isSystem && PageState.QueryString.ContainsKey("id"))
{
<button type="button" class="btn btn-danger" @onclick="DeleteFolder">Delete</button>
}
@ -53,7 +53,7 @@
<br />
@if (PageState.QueryString.ContainsKey("id"))
{
<AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
<AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
}
}
@ -61,54 +61,54 @@
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
public override string Title { get { return "Folder Management"; } }
List<Folder> folders;
int folderid = -1;
string name;
int parentid = -1;
bool issystem = false;
string permissions = "";
string createdby;
DateTime createdon;
string modifiedby;
DateTime modifiedon;
List<Folder> _folders;
int _folderId = -1;
string _name;
int _parentId = -1;
bool _isSystem = false;
string _permissions = "";
string _createdBy;
DateTime _createdOn;
string _modifiedBy;
DateTime _modifiedOn;
PermissionGrid permissiongrid;
PermissionGrid _permissionGrid;
protected override async Task OnInitializedAsync()
{
try
{
folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId);
_folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId);
if (PageState.QueryString.ContainsKey("id"))
{
folderid = Int32.Parse(PageState.QueryString["id"]);
Folder folder = await FolderService.GetFolderAsync(folderid);
_folderId = Int32.Parse(PageState.QueryString["id"]);
Folder folder = await FolderService.GetFolderAsync(_folderId);
if (folder != null)
{
parentid = folder.ParentId ?? -1;
name = folder.Name;
issystem = folder.IsSystem;
permissions = folder.Permissions;
createdby = folder.CreatedBy;
createdon = folder.CreatedOn;
modifiedby = folder.ModifiedBy;
modifiedon = folder.ModifiedOn;
_parentId = folder.ParentId ?? -1;
_name = folder.Name;
_isSystem = folder.IsSystem;
_permissions = folder.Permissions;
_createdBy = folder.CreatedBy;
_createdOn = folder.CreatedOn;
_modifiedBy = folder.ModifiedBy;
_modifiedOn = folder.ModifiedOn;
}
}
else
{
parentid = folders[0].FolderId;
List<PermissionString> permissionstrings = new List<PermissionString>();
permissionstrings.Add(new PermissionString { PermissionName = "Browse", Permissions = Constants.AdminRole });
permissionstrings.Add(new PermissionString { PermissionName = "View", Permissions = Constants.AdminRole });
permissionstrings.Add(new PermissionString { PermissionName = "Edit", Permissions = Constants.AdminRole });
permissions = UserSecurity.SetPermissionStrings(permissionstrings);
_parentId = _folders[0].FolderId;
List<PermissionString> permissionStrings = new List<PermissionString>();
permissionStrings.Add(new PermissionString { PermissionName = "Browse", Permissions = Constants.AdminRole });
permissionStrings.Add(new PermissionString { PermissionName = "View", Permissions = Constants.AdminRole });
permissionStrings.Add(new PermissionString { PermissionName = "Edit", Permissions = Constants.AdminRole });
_permissions = UserSecurity.SetPermissionStrings(permissionStrings);
}
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Loading Folder {FolderId} {Error}", folderid, ex.Message);
await logger.LogError(ex, "Error Loading Folder {FolderId} {Error}", _folderId, ex.Message);
AddModuleMessage("Error Loading Folder", MessageType.Error);
}
}
@ -117,12 +117,12 @@
{
try
{
if (name != "" && parentid != -1)
if (_name != "" && _parentId != -1)
{
Folder folder;
if (folderid != -1)
if (_folderId != -1)
{
folder = await FolderService.GetFolderAsync(folderid);
folder = await FolderService.GetFolderAsync(_folderId);
}
else
{
@ -130,19 +130,19 @@
}
folder.SiteId = PageState.Site.SiteId;
if (parentid == -1)
if (_parentId == -1)
{
folder.ParentId = null;
}
else
{
folder.ParentId = parentid;
folder.ParentId = _parentId;
}
folder.Name = name;
folder.IsSystem = issystem;
folder.Permissions = permissiongrid.GetPermissions();
folder.Name = _name;
folder.IsSystem = _isSystem;
folder.Permissions = _permissionGrid.GetPermissions();
if (folderid != -1)
if (_folderId != -1)
{
folder = await FolderService.UpdateFolderAsync(folder);
}
@ -161,7 +161,7 @@
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", folderid, ex.Message);
await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message);
AddModuleMessage("Error Saving Module", MessageType.Error);
}
}
@ -170,13 +170,13 @@
{
try
{
await FolderService.DeleteFolderAsync(folderid);
await logger.LogInformation("Folder Deleted {Folder}", folderid);
await FolderService.DeleteFolderAsync(_folderId);
await logger.LogInformation("Folder Deleted {Folder}", _folderId);
AddModuleMessage("Folder Deleted", MessageType.Success);
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Deleting Folder {Folder} {Error}", folderid, ex.Message);
await logger.LogError(ex, "Error Deleting Folder {Folder} {Error}", _folderId, ex.Message);
AddModuleMessage("Error Deleting Folder", MessageType.Error);
}
}