Merge pull request #359 from Blazam-App/Beta-Nightly

v0.9.2 hotfix
Blazam-App · May 7, 2024 · c0df38c · c0df38c
2 parents 571c90c + c823651
commit c0df38c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>0.9.2</AssemblyVersion>
-		<Version>2024.05.01.2331</Version>
+		<Version>2024.05.07.1847</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>

diff --git a/BLAZAM/Pages/Groups/ViewGroup.razor b/BLAZAM/Pages/Groups/ViewGroup.razor
@@ -87,7 +87,7 @@
                     </Section>
                 </MudItem>
                 <MudItem xs="12" md="6">
-                    <Section Style="min-height:200px;" Title=@AppLocalization["Member Of"]>
+                    <Section Style="min-height:200px;" Title=@AppLocalization["Parent Groups"]>
                         <MemberOfList Model="Group" />
 
                     </Section>

diff --git a/BLAZAMGui/UI/Groups/GroupMembersDataGrid.razor b/BLAZAMGui/UI/Groups/GroupMembersDataGrid.razor
@@ -62,10 +62,10 @@
                 </HeaderTemplate>
                 <CellTemplate Context="cellContext">
                     <MudTooltip 
-                                ShowOnClick=@(!cellContext.Item.CanEdit || !cellContext.Item.CanUnassign)
-                                ShowOnHover=@(!cellContext.Item.CanEdit || !cellContext.Item.CanUnassign)
+                                ShowOnClick=@(!cellContext.Item.CanUnassign)
+                                ShowOnHover=@(!cellContext.Item.CanUnassign)
                                 Text="You don't have permission to remove this group member">
-                        <MudButton Disabled=@(!cellContext.Item.CanEdit || !cellContext.Item.CanUnassign)
+                        <MudButton Disabled=@(!cellContext.Item.CanUnassign)
                                    Color="Color.Error"
                                    OnClick="(()=>{Group.UnassignMember(cellContext.Item);InvokeAsync(OnInitializedAsync);})">
                             @AppLocalization["Remove"]

diff --git a/BLAZAMGui/UI/Settings/ActiveDirectoryStatusPanel.razor b/BLAZAMGui/UI/Settings/ActiveDirectoryStatusPanel.razor
@@ -33,10 +33,11 @@
     <MudStack Row=true Class="align-center">
         @AppLocalization["Connection Type"]
 
-        <StatusCheck Status=@(Directory.AppRootDirectoryEntry.AuthenticationType.Equals(AuthenticationTypes.Encryption)||
+        <StatusCheck Status=@(Directory.AppRootDirectoryEntry !=null &&(
+            Directory.AppRootDirectoryEntry.AuthenticationType.Equals(AuthenticationTypes.Encryption)||
         Directory.AppRootDirectoryEntry.AuthenticationType.Equals(AuthenticationTypes.SecureSocketsLayer)||
-        Directory.AppRootDirectoryEntry.AuthenticationType.Equals(AuthenticationTypes.Secure))
-        Text="@(Directory.AppRootDirectoryEntry.AuthenticationType.ToString())" />
+        Directory.AppRootDirectoryEntry.AuthenticationType.Equals(AuthenticationTypes.Secure)))
+        Text="@(Directory.AppRootDirectoryEntry?.AuthenticationType.ToString())" />
 
 
     </MudStack>