Merge pull request #6116 from oqtane/dev

10.1.1 Release

Author: sbwalker

Directory.Build.props

@@ -2,15 +2,15 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>10.1.0</Version>
+    <Version>10.1.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
     <Description>CMS and Application Framework for Blazor and .NET MAUI</Description>
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v10.1.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
   </PropertyGroup>

Oqtane.Application/Client/Oqtane.Application.Client.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Oqtane.Client" Version="10.1.0" />
+    <PackageReference Include="Oqtane.Client" Version="10.1.1" />
   </ItemGroup>
 
 </Project>

Oqtane.Application/Oqtane.Application.Template.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Oqtane.Application.Template</id>
-    <version>10.1.0</version>
+    <version>10.1.1</version>
     <title>Oqtane Application Template For Blazor</title>
     <authors>Shaun Walker</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

Oqtane.Application/Server/Oqtane.Application.Server.csproj

@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Oqtane.Server" Version="10.1.0" />
+    <PackageReference Include="Oqtane.Server" Version="10.1.1" />
   </ItemGroup>
 
 </Project>

Oqtane.Application/Shared/Oqtane.Application.Shared.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Oqtane.Shared" Version="10.1.0" />
+    <PackageReference Include="Oqtane.Shared" Version="10.1.1" />
   </ItemGroup>
 
 </Project>

Oqtane.Client/Modules/Admin/GlobalReplace/Index.razor

@@ -28,7 +28,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="site" HelpText="Specify if site properties should be updated (ie. name, headcontent, bodycontent)" ResourceKey="Site">Site Properties? </Label>
+        <Label Class="col-sm-3" For="site" HelpText="Specify if site information should be updated (ie. name, head content, body content, settings)" ResourceKey="Site">Site Info? </Label>
         <div class="col-sm-9">
             <select id="site" class="form-select" @bind="@_site">
                 <option value="True">@SharedLocalizer["Yes"]</option>
@@ -37,7 +37,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="pages" HelpText="Specify if page properties should be updated (ie. name, title, headcontent, bodycontent)" ResourceKey="Pages">Page Properties? </Label>
+        <Label Class="col-sm-3" For="pages" HelpText="Specify if page information should be updated (ie. name, title, head content, body content, settings)" ResourceKey="Pages">Page Info? </Label>
         <div class="col-sm-9">
             <select id="pages" class="form-select" @bind="@_pages">
                 <option value="True">@SharedLocalizer["Yes"]</option>
@@ -46,7 +46,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="modules" HelpText="Specify if module properties should be updated (ie. title, header, footer)" ResourceKey="Modules">Module Properties? </Label>
+        <Label Class="col-sm-3" For="modules" HelpText="Specify if module information should be updated (ie. title, header, footer, settings)" ResourceKey="Modules">Module Info? </Label>
         <div class="col-sm-9">
             <select id="modules" class="form-select" @bind="@_modules">
                 <option value="True">@SharedLocalizer["Yes"]</option>

Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor

@@ -130,7 +130,7 @@ else
 
     private async Task LoadModuleDefinitions()
     {
-        _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
+        _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Split(',', StringSplitOptions.RemoveEmptyEntries).Contains(_category)).ToList();
         _packages = await PackageService.GetPackageUpdatesAsync("module");
     }
 

Oqtane.Client/Modules/Admin/Site/Index.razor

@@ -1413,10 +1413,13 @@
     {
         if (_siteGroupId != -1)
         {
-            var siteGroupMember = await SiteGroupMemberService.GetSiteGroupMemberAsync(PageState.Site.SiteId, _siteGroupId);
-            if (siteGroupMember != null)
+            if (_siteId != -1)
             {
-                await SiteGroupMemberService.DeleteSiteGroupMemberAsync(siteGroupMember.SiteGroupId);
+                var siteGroupMember = await SiteGroupMemberService.GetSiteGroupMemberAsync(_siteId, _siteGroupId);
+                if (siteGroupMember != null)
+                {
+                    await SiteGroupMemberService.DeleteSiteGroupMemberAsync(siteGroupMember.SiteGroupMemberId);
+                }
             }
 
             var siteGroupMembers = await SiteGroupMemberService.GetSiteGroupMembersAsync(-1, _siteGroupId);

Oqtane.Client/Oqtane.Client.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.3" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.3" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
-    <PackageReference Include="Radzen.Blazor" Version="9.0.0" />
+    <PackageReference Include="Radzen.Blazor" Version="9.0.8" />
   </ItemGroup>
 
   <ItemGroup>

Oqtane.Client/Resources/Modules/Admin/GlobalReplace/Index.resx

@@ -130,16 +130,16 @@
     <value>Specify if module content should be updated</value>
   </data>
   <data name="Pages.Text" xml:space="preserve">
-    <value>Page Properties?</value>
+    <value>Page Info?</value>
   </data>
   <data name="Pages.HelpText" xml:space="preserve">
-    <value>Specify if page properties should be updated (ie. name, title, headcontent, bodycontent)</value>
+    <value>Specify if page information should be updated (ie. name, title, head content, body content settings)</value>
   </data>
   <data name="Site.Text" xml:space="preserve">
-    <value>Site Properties?</value>
+    <value>Site Info?</value>
   </data>
   <data name="Site.HelpText" xml:space="preserve">
-    <value>Specify if site properties should be updated (ie. name, headcontent, bodycontent)</value>
+    <value>Specify if site information should be updated (ie. name, head content, body content, settings)</value>
   </data>
   <data name="Replace.Text" xml:space="preserve">
     <value>Replace With:</value>
@@ -148,10 +148,10 @@
     <value>Specify the replacement content</value>
   </data>
   <data name="Modules.Text" xml:space="preserve">
-    <value>Module Properties?</value>
+    <value>Module Info?</value>
   </data>
   <data name="Modules.HelpText" xml:space="preserve">
-    <value>Specify if module properties should be updated (ie. title, header, footer)</value>
+    <value>Specify if module information should be updated (ie. title, header, footer settings)</value>
   </data>
   <data name="Success.Save" xml:space="preserve">
     <value>Your Global Replace Request Has Been Submitted And Will Be Executed Shortly. Please Be Patient.</value>