@@ -28,31 +28,31 @@
@@ -85,113 +85,113 @@
}
- @code {
- private int _profileid = -1;
- private ElementReference form;
- private bool validated = false;
- private string _name = string.Empty;
- private string _title = string.Empty;
- private string _description = string.Empty;
- private string _category = string.Empty;
- private string _vieworder = "0";
- private string _maxlength = "0";
- private string _defaultvalue = string.Empty;
- private string _options = string.Empty;
- private string _isrequired = "False";
- private string _isprivate = "False";
- private string createdby;
- private DateTime createdon;
- private string modifiedby;
- private DateTime modifiedon;
+@code {
+ private int _profileid = -1;
+ private ElementReference form;
+ private bool validated = false;
+ private string _name = string.Empty;
+ private string _title = string.Empty;
+ private string _description = string.Empty;
+ private string _category = string.Empty;
+ private string _vieworder = "0";
+ private string _maxlength = "0";
+ private string _defaultvalue = string.Empty;
+ private string _options = string.Empty;
+ private string _isrequired = "False";
+ private string _isprivate = "False";
+ private string createdby;
+ private DateTime createdon;
+ private string modifiedby;
+ private DateTime modifiedon;
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
- public override string Actions => "Add,Edit";
+ public override string Actions => "Add,Edit";
- protected override async Task OnInitializedAsync()
+ protected override async Task OnInitializedAsync()
+ {
+ try
+ {
+ if (PageState.QueryString.ContainsKey("id"))
+ {
+ _profileid = Int32.Parse(PageState.QueryString["id"]);
+ var profile = await ProfileService.GetProfileAsync(_profileid);
+ if (profile != null)
+ {
+ _name = profile.Name;
+ _title = profile.Title;
+ _description = profile.Description;
+ _category = profile.Category;
+ _vieworder = profile.ViewOrder.ToString();
+ _maxlength = profile.MaxLength.ToString();
+ _defaultvalue = profile.DefaultValue;
+ _options = profile.Options;
+ _isrequired = profile.IsRequired.ToString();
+ _isprivate = profile.IsPrivate.ToString();
+ createdby = profile.CreatedBy;
+ createdon = profile.CreatedOn;
+ modifiedby = profile.ModifiedBy;
+ modifiedon = profile.ModifiedOn;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Loading Profile {ProfileId} {Error}", _profileid, ex.Message);
+ AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
+ }
+ }
+
+ private async Task SaveProfile()
+ {
+ validated = true;
+ var interop = new Interop(JSRuntime);
+ if (await interop.FormValid(form))
{
try
{
- if (PageState.QueryString.ContainsKey("id"))
+ Profile profile;
+ if (_profileid != -1)
{
- _profileid = Int32.Parse(PageState.QueryString["id"]);
- var profile = await ProfileService.GetProfileAsync(_profileid);
- if (profile != null)
- {
- _name = profile.Name;
- _title = profile.Title;
- _description = profile.Description;
- _category = profile.Category;
- _vieworder = profile.ViewOrder.ToString();
- _maxlength = profile.MaxLength.ToString();
- _defaultvalue = profile.DefaultValue;
- _options = profile.Options;
- _isrequired = profile.IsRequired.ToString();
- _isprivate = profile.IsPrivate.ToString();
- createdby = profile.CreatedBy;
- createdon = profile.CreatedOn;
- modifiedby = profile.ModifiedBy;
- modifiedon = profile.ModifiedOn;
- }
+ profile = await ProfileService.GetProfileAsync(_profileid);
}
+ else
+ {
+ profile = new Profile();
+ }
+
+ profile.SiteId = PageState.Site.SiteId;
+ profile.Name = _name;
+ profile.Title = _title;
+ profile.Description = _description;
+ profile.Category = _category;
+ profile.ViewOrder = int.Parse(_vieworder);
+ profile.MaxLength = int.Parse(_maxlength);
+ profile.DefaultValue = _defaultvalue;
+ profile.Options = _options;
+ profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));
+ profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate));
+ if (_profileid != -1)
+ {
+ profile = await ProfileService.UpdateProfileAsync(profile);
+ }
+ else
+ {
+ profile = await ProfileService.AddProfileAsync(profile);
+ }
+
+ await logger.LogInformation("Profile Saved {Profile}", profile);
+ NavigationManager.NavigateTo(NavigateUrl());
}
catch (Exception ex)
{
- await logger.LogError(ex, "Error Loading Profile {ProfileId} {Error}", _profileid, ex.Message);
- AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
+ await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message);
+ AddModuleMessage(Localizer["Error.Profile.Save"], MessageType.Error);
}
}
-
- private async Task SaveProfile()
+ else
{
- validated = true;
- var interop = new Interop(JSRuntime);
- if (await interop.FormValid(form))
- {
- try
- {
- Profile profile;
- if (_profileid != -1)
- {
- profile = await ProfileService.GetProfileAsync(_profileid);
- }
- else
- {
- profile = new Profile();
- }
-
- profile.SiteId = PageState.Site.SiteId;
- profile.Name = _name;
- profile.Title = _title;
- profile.Description = _description;
- profile.Category = _category;
- profile.ViewOrder = int.Parse(_vieworder);
- profile.MaxLength = int.Parse(_maxlength);
- profile.DefaultValue = _defaultvalue;
- profile.Options = _options;
- profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));
- profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate));
- if (_profileid != -1)
- {
- profile = await ProfileService.UpdateProfileAsync(profile);
- }
- else
- {
- profile = await ProfileService.AddProfileAsync(profile);
- }
-
- await logger.LogInformation("Profile Saved {Profile}", profile);
- NavigationManager.NavigateTo(NavigateUrl());
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message);
- AddModuleMessage(Localizer["Error.Profile.Save"], MessageType.Error);
- }
- }
- else
- {
- AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
- }
+ AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
}
}
+}
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
index 875cf450..1f7ad685 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
@@ -10,56 +10,56 @@
}
else
{
-
+
-
-
- |
- |
- @SharedLocalizer["Name"] |
-
-
- |
- |
- @context.Name |
-
-
+
+
+ |
+ |
+ @SharedLocalizer["Name"] |
+
+
+ |
+ |
+ @context.Name |
+
+
}
- @code {
- private List
_profiles;
- private ElementReference form;
- private bool validated = false;
+@code {
+ private List _profiles;
+ private ElementReference form;
+ private bool validated = false;
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
- protected override async Task OnParametersSetAsync()
- {
- await GetProfilesAsync();
- }
+ protected override async Task OnParametersSetAsync()
+ {
+ await GetProfilesAsync();
+ }
- private async Task DeleteProfile(int profileId)
- {
- try
- {
- await ProfileService.DeleteProfileAsync(profileId);
- await logger.LogInformation("Profile Deleted {ProfileId}", profileId);
+ private async Task DeleteProfile(int profileId)
+ {
+ try
+ {
+ await ProfileService.DeleteProfileAsync(profileId);
+ await logger.LogInformation("Profile Deleted {ProfileId}", profileId);
- AddModuleMessage(Localizer["Success.Profile.Delete"], MessageType.Success);
+ AddModuleMessage(Localizer["Success.Profile.Delete"], MessageType.Success);
- await GetProfilesAsync();
+ await GetProfilesAsync();
- StateHasChanged();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Deleting Profile {ProfileId} {Error}", profileId, ex.Message);
- AddModuleMessage(Localizer["Error.Profile.Delete"], MessageType.Error);
- }
- }
-
- private async Task GetProfilesAsync()
- {
- _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
- }
+ StateHasChanged();
}
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Deleting Profile {ProfileId} {Error}", profileId, ex.Message);
+ AddModuleMessage(Localizer["Error.Profile.Delete"], MessageType.Error);
+ }
+ }
+
+ private async Task GetProfilesAsync()
+ {
+ _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+ }
+}
diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index eb157538..e70165b9 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -7,182 +7,208 @@
@inject IStringLocalizer Localizer
@inject IStringLocalizer SharedLocalizer
-
-
- @if (_pages == null)
- {
-
- @Localizer["NoPage.Deleted"]
- }
- else
- {
-
-
- |
- |
- @SharedLocalizer["Name"] |
- @Localizer["DeletedBy"] |
- @Localizer["DeletedOn"] |
-
-
- |
- |
- @context.Name |
- @context.DeletedBy |
- @context.DeletedOn |
-
-
- @if (_pages.Any())
- {
-
- }
- }
-
-
- @if (_modules == null)
- {
-
- @Localizer["NoModule.Deleted"]
- }
- else
- {
-
-
- |
- |
- @Localizer["Page"] |
- @Localizer["Module"] |
- @Localizer["DeletedBy"] |
- @Localizer["DeletedOn"] |
-
-
- |
- |
- @PageState.Pages.Find(item => item.PageId == context.PageId).Name |
- @context.Title |
- @context.DeletedBy |
- @context.DeletedOn |
-
-
- @if (_modules.Any())
- {
-
- }
-
- }
-
-
-
- @code {
- private List _pages;
- private List _modules;
-
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
-
- protected override async Task OnInitializedAsync()
+
+
+ @if (_pages == null)
{
- try
+
+ @Localizer["NoPage.Deleted"]
+ }
+ else
+ {
+
+
+ |
+ |
+ @SharedLocalizer["Name"] |
+ @Localizer["DeletedBy"] |
+ @Localizer["DeletedOn"] |
+
+
+ |
+ |
+ @context.Name |
+ @context.DeletedBy |
+ @context.DeletedOn |
+
+
+ @if (_pages.Any())
{
- await Load();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Loading Deleted Pages Or Modules {Error}", ex.Message);
- AddModuleMessage(Localizer["Error.DeletedModulePage.Load"], MessageType.Error);
+
}
}
-
- private async Task Load()
+
+
+ @if (_modules == null)
{
- _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
- _pages = _pages.Where(item => item.IsDeleted).ToList();
-
- _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
- _modules = _modules.Where(item => item.IsDeleted).ToList();
+
+ @Localizer["NoModule.Deleted"]
}
-
- private async Task RestorePage(Page page)
+ else
{
- try
+
+
+ |
+ |
+ @Localizer["Page"] |
+ @Localizer["Module"] |
+ @Localizer["DeletedBy"] |
+ @Localizer["DeletedOn"] |
+
+
+ |
+ |
+ @PageState.Pages.Find(item => item.PageId == context.PageId).Name |
+ @context.Title |
+ @context.DeletedBy |
+ @context.DeletedOn |
+
+
+ @if (_modules.Any())
{
- page.IsDeleted = false;
- await PageService.UpdatePageAsync(page);
- await logger.LogInformation("Page Restored {Page}", page);
- await Load();
- StateHasChanged();
- NavigationManager.NavigateTo(NavigateUrl());
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Restoring Deleted Page {Page} {Error}", page, ex.Message);
- AddModuleMessage(Localizer["Error.Page.Restore"], MessageType.Error);
+
}
+
}
+
+
- private async Task DeletePage(Page page)
+@code {
+ private List _pages;
+ private List _modules;
+
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+ protected override async Task OnInitializedAsync()
+ {
+ try
{
- try
+ await Load();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Loading Deleted Pages Or Modules {Error}", ex.Message);
+ AddModuleMessage(Localizer["Error.DeletedModulePage.Load"], MessageType.Error);
+ }
+ }
+
+ private async Task Load()
+ {
+ _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+ _pages = _pages.Where(item => item.IsDeleted).ToList();
+
+ _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
+ _modules = _modules.Where(item => item.IsDeleted).ToList();
+ }
+
+ private async Task RestorePage(Page page)
+ {
+ try
+ {
+ page.IsDeleted = false;
+ await PageService.UpdatePageAsync(page);
+ await logger.LogInformation("Page Restored {Page}", page);
+ await Load();
+ StateHasChanged();
+ NavigationManager.NavigateTo(NavigateUrl());
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Restoring Deleted Page {Page} {Error}", page, ex.Message);
+ AddModuleMessage(Localizer["Error.Page.Restore"], MessageType.Error);
+ }
+ }
+
+ private async Task DeletePage(Page page)
+ {
+ try
+ {
+ await PageService.DeletePageAsync(page.PageId);
+ await logger.LogInformation("Page Permanently Deleted {Page}", page);
+ await Load();
+ StateHasChanged();
+ NavigationManager.NavigateTo(NavigateUrl());
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Permanently Deleting Page {Page} {Error}", page, ex.Message);
+ AddModuleMessage(ex.Message, MessageType.Error);
+ }
+ }
+
+ private async Task DeleteAllPages()
+ {
+ try
+ {
+ foreach (Page page in _pages)
{
await PageService.DeletePageAsync(page.PageId);
await logger.LogInformation("Page Permanently Deleted {Page}", page);
- await Load();
- StateHasChanged();
- NavigationManager.NavigateTo(NavigateUrl());
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Permanently Deleting Page {Page} {Error}", page, ex.Message);
- AddModuleMessage(ex.Message, MessageType.Error);
}
+
+ await logger.LogInformation("Pages Permanently Deleted");
+ await Load();
+ StateHasChanged();
+ NavigationManager.NavigateTo(NavigateUrl());
}
-
- private async Task DeleteAllPages()
+ catch (Exception ex)
{
- try
- {
- foreach (Page page in _pages)
- {
- await PageService.DeletePageAsync(page.PageId);
- await logger.LogInformation("Page Permanently Deleted {Page}", page);
- }
-
- await logger.LogInformation("Pages Permanently Deleted");
- await Load();
- StateHasChanged();
- NavigationManager.NavigateTo(NavigateUrl());
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Permanently Deleting Pages {Error}", ex.Message);
- AddModuleMessage(ex.Message, MessageType.Error);
- }
+ await logger.LogError(ex, "Error Permanently Deleting Pages {Error}", ex.Message);
+ AddModuleMessage(ex.Message, MessageType.Error);
}
+ }
- private async Task RestoreModule(Module module)
+ private async Task RestoreModule(Module module)
+ {
+ try
{
- try
- {
- var pagemodule = await PageModuleService.GetPageModuleAsync(module.PageModuleId);
- pagemodule.IsDeleted = false;
- await PageModuleService.UpdatePageModuleAsync(pagemodule);
- await logger.LogInformation("Module Restored {Module}", module);
- await Load();
- StateHasChanged();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Restoring Deleted Module {Module} {Error}", module, ex.Message);
- AddModuleMessage(Localizer["Error.Module.Restore"], MessageType.Error);
- }
+ var pagemodule = await PageModuleService.GetPageModuleAsync(module.PageModuleId);
+ pagemodule.IsDeleted = false;
+ await PageModuleService.UpdatePageModuleAsync(pagemodule);
+ await logger.LogInformation("Module Restored {Module}", module);
+ await Load();
+ StateHasChanged();
}
-
- private async Task DeleteModule(Module module)
+ catch (Exception ex)
{
- try
+ await logger.LogError(ex, "Error Restoring Deleted Module {Module} {Error}", module, ex.Message);
+ AddModuleMessage(Localizer["Error.Module.Restore"], MessageType.Error);
+ }
+ }
+
+ private async Task DeleteModule(Module module)
+ {
+ try
+ {
+ await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
+ // check if there are any remaining module instances in the site
+ _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
+
+ if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
+ {
+ await ModuleService.DeleteModuleAsync(module.ModuleId);
+ }
+
+ await logger.LogInformation("Module Permanently Deleted {Module}", module);
+ await Load();
+ StateHasChanged();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Permanently Deleting Module {Module} {Error}", module, ex.Message);
+ AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
+ }
+ }
+
+ private async Task DeleteAllModules()
+ {
+ try
+ {
+ foreach (Module module in _modules)
{
await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
// check if there are any remaining module instances in the site
@@ -192,42 +218,16 @@
{
await ModuleService.DeleteModuleAsync(module.ModuleId);
}
+ }
- await logger.LogInformation("Module Permanently Deleted {Module}", module);
- await Load();
- StateHasChanged();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Permanently Deleting Module {Module} {Error}", module, ex.Message);
- AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
- }
+ await logger.LogInformation("Modules Permanently Deleted");
+ await Load();
+ StateHasChanged();
}
-
- private async Task DeleteAllModules()
+ catch (Exception ex)
{
- try
- {
- foreach (Module module in _modules)
- {
- await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
- // check if there are any remaining module instances in the site
- _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-
- if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
- {
- await ModuleService.DeleteModuleAsync(module.ModuleId);
- }
- }
-
- await logger.LogInformation("Modules Permanently Deleted");
- await Load();
- StateHasChanged();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Permanently Deleting Modules {Error}", ex.Message);
- AddModuleMessage(Localizer["Error.Modules.Delete"], MessageType.Error);
- }
+ await logger.LogError(ex, "Error Permanently Deleting Modules {Error}", ex.Message);
+ AddModuleMessage(Localizer["Error.Modules.Delete"], MessageType.Error);
}
}
+}
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index d98bf8f4..53c5382c 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -21,31 +21,31 @@
@@ -55,82 +55,82 @@
- }
- else
- {
+}
+else
+{
- }
+}
- @code {
- private string _username = string.Empty;
- private ElementReference form;
- private bool validated = false;
- private string _password = string.Empty;
- private string _confirm = string.Empty;
- private string _email = string.Empty;
- private string _displayname = string.Empty;
+@code {
+ private string _username = string.Empty;
+ private ElementReference form;
+ private bool validated = false;
+ private string _password = string.Empty;
+ private string _confirm = string.Empty;
+ private string _email = string.Empty;
+ private string _displayname = string.Empty;
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
- private async Task Register()
+ private async Task Register()
+ {
+ validated = true;
+ var interop = new Interop(JSRuntime);
+ if (await interop.FormValid(form))
+ {
+ try
{
- validated = true;
- var interop = new Interop(JSRuntime);
- if (await interop.FormValid(form))
+ bool _isEmailValid = Utilities.IsValidEmail(_email);
+
+ if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
{
- try
+ if (_password == _confirm)
{
- bool _isEmailValid = Utilities.IsValidEmail(_email);
-
- if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
+ var user = new User
{
- if (_password == _confirm)
- {
- var user = new User
- {
- SiteId = PageState.Site.SiteId,
- Username = _username,
- DisplayName = (_displayname == string.Empty ? _username : _displayname),
- Email = _email,
- Password = _password
- };
- user = await UserService.AddUserAsync(user);
+ SiteId = PageState.Site.SiteId,
+ Username = _username,
+ DisplayName = (_displayname == string.Empty ? _username : _displayname),
+ Email = _email,
+ Password = _password
+ };
+ user = await UserService.AddUserAsync(user);
- if (user != null)
- {
- await logger.LogInformation("User Created {Username} {Email}", _username, _email);
- AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
- }
- else
- {
- await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
- AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error);
- }
- }
- else
- {
- AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
- }
+ if (user != null)
+ {
+ await logger.LogInformation("User Created {Username} {Email}", _username, _email);
+ AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
}
else
{
- AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+ await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
+ AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error);
}
}
- catch (Exception ex)
+ else
{
- await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
- AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
+ AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
}
}
else
{
- AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+ AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
}
}
-
- private void Cancel()
+ catch (Exception ex)
{
- NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+ await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
+ AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
}
}
+ else
+ {
+ AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+ }
+ }
+
+ private void Cancel()
+ {
+ NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+ }
+}
diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor
index faa10d2c..31ebb1f5 100644
--- a/Oqtane.Client/Modules/Admin/Reset/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor
@@ -9,7 +9,7 @@
-
+
@@ -24,82 +24,82 @@
- @code {
- private ElementReference form;
- private bool validated = false;
- private string _username = string.Empty;
- private string _password = string.Empty;
- private string _confirm = string.Empty;
+@code {
+ private ElementReference form;
+ private bool validated = false;
+ private string _username = string.Empty;
+ private string _password = string.Empty;
+ private string _confirm = string.Empty;
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
- protected override void OnInitialized()
+ protected override void OnInitialized()
+ {
+ if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
{
- if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
- {
- _username = PageState.QueryString["name"];
- }
- else
- {
- NavigationManager.NavigateTo(NavigateUrl(string.Empty));
- }
+ _username = PageState.QueryString["name"];
}
-
- private async Task Reset()
- {
- validated = true;
- var interop = new Interop(JSRuntime);
- if (await interop.FormValid(form))
- {
- try
- {
- if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
- {
- if (_password == _confirm)
- {
- var user = new User
- {
- SiteId = PageState.Site.SiteId,
- Username = _username,
- Password = _password
- };
- user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]);
-
- if (user != null)
- {
- await logger.LogInformation("User Password Reset {Username}", _username);
- NavigationManager.NavigateTo(NavigateUrl("login"));
- }
- else
- {
- await logger.LogError("Error Resetting User Password {Username}", _username);
- AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error);
- }
- }
- else
- {
- AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
- }
- }
- else
- {
- AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
- }
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
- AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error);
- }
- }
- else
- {
- AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
- }
- }
-
- private void Cancel()
+ else
{
NavigationManager.NavigateTo(NavigateUrl(string.Empty));
}
}
+
+ private async Task Reset()
+ {
+ validated = true;
+ var interop = new Interop(JSRuntime);
+ if (await interop.FormValid(form))
+ {
+ try
+ {
+ if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
+ {
+ if (_password == _confirm)
+ {
+ var user = new User
+ {
+ SiteId = PageState.Site.SiteId,
+ Username = _username,
+ Password = _password
+ };
+ user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]);
+
+ if (user != null)
+ {
+ await logger.LogInformation("User Password Reset {Username}", _username);
+ NavigationManager.NavigateTo(NavigateUrl("login"));
+ }
+ else
+ {
+ await logger.LogError("Error Resetting User Password {Username}", _username);
+ AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error);
+ }
+ }
+ else
+ {
+ AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
+ }
+ }
+ else
+ {
+ AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+ }
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
+ AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error);
+ }
+ }
+ else
+ {
+ AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+ }
+ }
+
+ private void Cancel()
+ {
+ NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+ }
+}
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index 63cc671e..cdc1349c 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -10,21 +10,21 @@
}
else
{
-
-
-
- |
- |
- |
- @SharedLocalizer["Name"] |
-
-
- |
- |
- |
- @context.Name |
-
-
+
+
+
+ |
+ |
+ |
+ @SharedLocalizer["Name"] |
+
+
+ |
+ |
+ |
+ @context.Name |
+
+
}
@code {
@@ -39,30 +39,30 @@ else
private async Task DeleteRole(Role role)
{
- try
- {
- await RoleService.DeleteRoleAsync(role.RoleId);
- await logger.LogInformation("Role Deleted {Role}", role);
- await GetRoles();
- StateHasChanged();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Deleting Role {Role} {Error}", role, ex.Message);
- AddModuleMessage(Localizer["Error.DeleteRole"], MessageType.Error);
- }
+ try
+ {
+ await RoleService.DeleteRoleAsync(role.RoleId);
+ await logger.LogInformation("Role Deleted {Role}", role);
+ await GetRoles();
+ StateHasChanged();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Deleting Role {Role} {Error}", role, ex.Message);
+ AddModuleMessage(Localizer["Error.DeleteRole"], MessageType.Error);
+ }
}
private async Task GetRoles()
{
- if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
- {
- _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
- _roles = _roles.Where(item => item.Name != RoleNames.Everyone).ToList();
- }
- else
- {
- _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
- }
+ if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+ {
+ _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
+ _roles = _roles.Where(item => item.Name != RoleNames.Everyone).ToList();
+ }
+ else
+ {
+ _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
+ }
}
}
diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor
index 8d866124..92015116 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Users.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor
@@ -12,189 +12,189 @@
else
{
-