Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Dependencies #499

Merged
merged 2 commits into from
Aug 17, 2024
Merged

Update Dependencies #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d46dbb7
Update Dependencies
jacobsen9026 Aug 17, 2024
fb988e7
Increment build
jacobsen9026 Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions BLAZAM/BLAZAM.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<ServerGarbageCollection>false</ServerGarbageCollection>
<AssemblyVersion>1.0.0</AssemblyVersion>
<Version>2024.08.17.2034</Version>
<Version>2024.08.17.2047</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<RootNamespace>BLAZAM</RootNamespace>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
Expand Down Expand Up @@ -58,21 +58,21 @@
<PackageReference Include="Cassia" Version="2.0.0.60" />
<PackageReference Include="DuoUniversal" Version="1.2.5" />
<PackageReference Include="MailKit" Version="4.7.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7">
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.3" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.4" />
<PackageReference Include="MudBlazor" Version="7.6.0" />
<PackageReference Include="MudBlazor.Markdown" Version="1.0.2" />
<PackageReference Include="MudBlazor.ThemeManager" Version="2.0.0" />
Expand Down
23 changes: 14 additions & 9 deletions BLAZAM/Pages/Configure/Templates.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,21 @@
<AppDocumentationButton Page="/admin/templates" />
</MudStack>

<AppModal @ref=RenameModal Title=@AppLocalization["Rename Category"]>
<AppModal @ref=RenameModal
Title=@AppLocalization["Rename Category"]>


<MudTextField Label="New Name" @bind-Value=newCategoryName />


<MudButton Color="Color.Primary" OnClick="RenameSelectedCategory">Save</MudButton>
<MudButton Color="Color.Primary"
OnClick="RenameSelectedCategory">Save</MudButton>
</AppModal>

<AppModal YesText="@AppLocalization["Restore"]" OnYes="RestoreSelectedTemplates" @ref=RestoreModal Title=@AppLocalization["Restore Template"]>
<AppModal YesText="@AppLocalization["Restore"]"
OnYes="RestoreSelectedTemplates"
@ref=RestoreModal
Title=@AppLocalization["Restore Template"]>

<MudDataGrid @ref=restoreDataGrid Items="Templates.Where(t=>t.DeletedAt!=null)" SelectOnRowClick=true>
<Columns>
Expand Down Expand Up @@ -224,15 +229,15 @@
}
private IReadOnlyCollection<TreeItemData<DirectoryTemplate>> CreateTemplateTreeItemData()
{

List<TreeItemData<DirectoryTemplate>> treeData = new();

var rootTemplates = Templates.Where(t => t.ParentTemplate == null && t.DeletedAt == null).ToTreeItemData();
List<TreeItemData<DirectoryTemplate>> treeData = new();

var rootTemplates = Templates.Where(t => t.ParentTemplate == null && t.DeletedAt == null).ToTreeItemData();

treeData = RecursiveFillTreeViewItems(rootTemplates);
return treeData;

treeData = RecursiveFillTreeViewItems(rootTemplates);
return treeData;


}

[Obsolete]
Expand Down
4 changes: 2 additions & 2 deletions BLAZAM/Pages/Users/CreateUser.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ newUser?.StagePasswordChange(customConfirmPassword.ToSecureString());
}
catch (Exception ex)
{
Loggers.ActiveDirectryLogger.Error("Could not set value for " + fieldValue.Field?.FieldName + ": " + fieldValue.Value?.ToString() + " {@Error}", ex);
Loggers.ActiveDirectoryLogger.Error("Could not set value for " + fieldValue.Field?.FieldName + ": " + fieldValue.Value?.ToString() + " {@Error}", ex);
}

}
Expand Down Expand Up @@ -342,7 +342,7 @@ newUser?.StagePasswordChange(customConfirmPassword.ToSecureString());
catch (Exception ex)
{

Loggers.ActiveDirectryLogger.Error("Error while creating template user {@Error}", ex);
Loggers.ActiveDirectoryLogger.Error("Error while creating template user {@Error}", ex);

SnackBarService.Error(AppLocalization["An error has occurred while trying to create the template user: "] + ex.Message);
}
Expand Down
2 changes: 1 addition & 1 deletion BLAZAM/Pages/Users/ViewUser.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@

catch (Exception ex)
{
Loggers.ActiveDirectryLogger.Warning("Error checking user h-drive: {Message}", ex);
Loggers.ActiveDirectoryLogger.Warning("Error checking user h-drive: {Message}", ex);

}
}
Expand Down
Loading