Directory Entry Context Menu

Blazam-App · Oct 1, 2024 · 8f55a51 · 8f55a51
1 parent 45e457e
commit 8f55a51
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>1.0.3</AssemblyVersion>
-		<Version>2024.09.28.2337</Version>
+		<Version>2024.10.01.0034</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>

diff --git a/BLAZAMGui/UI/Dashboard/Widgets/LockedOutUsers.razor b/BLAZAMGui/UI/Dashboard/Widgets/LockedOutUsers.razor
@@ -29,13 +29,7 @@
                     </ChildContent>
                     <MenuContents>
 
-                        @if (@context.Item.CanUnlock)
-                        {
-                            <MudMenuItem OnClick="(()=>{UnlockAccount(context.Item);})" Icon="@Icons.Material.Outlined.LockOpen">
-                                @AppLocalization["Unlock User"]
-                            </MudMenuItem>
-
-                        }
+                     <DirectoryEntryContextMenuItems Entry="@context.Item"/>
 
                     </MenuContents>
                 </MudContextMenu>

diff --git a/BLAZAMGui/UI/Dashboard/Widgets/NewEntriesWidgetDataGrid.razor b/BLAZAMGui/UI/Dashboard/Widgets/NewEntriesWidgetDataGrid.razor
@@ -20,15 +20,28 @@
     <Columns>
         <TemplateColumn Title=@AppLocalization["Name"]>
             <CellTemplate>
-                <AppTooltip Text="@context.Item?.OU.ToPrettyOu()">
-                    <MudText>@context.Item.CanonicalName</MudText>
-                </AppTooltip>
+                <MudContextMenu>
+
+                    <ChildContent>
+
+                        <AppTooltip Text="@context.Item?.OU.ToPrettyOu()">
+                            <MudText>@context.Item?.CanonicalName</MudText>
+                        </AppTooltip>
+
+                    </ChildContent>
+                    <MenuContents>
+
+                        <DirectoryEntryContextMenuItems Entry="@context.Item" />
+
+                    </MenuContents>
+                </MudContextMenu>
             </CellTemplate>
         </TemplateColumn>
         <TemplateColumn Title=@AppLocalization["Created"]>
             <CellTemplate>
                 @if (context.Item?.Created != null)
                 {
+
                     <MudText>@context.Item.Created.Value.ToLocalTime()</MudText>
                 }
             </CellTemplate>

diff --git a/BLAZAMGui/UI/Users/DirectoryEntryContextMenuItems.razor b/BLAZAMGui/UI/Users/DirectoryEntryContextMenuItems.razor
@@ -4,10 +4,22 @@
     if(account.CanUnlock && account.LockedOut)
     {
         <MudMenuItem OnClick="(()=>{UnlockAccount(account);})" Icon="@Icons.Material.Outlined.LockOpen">
-            @AppLocalization["Unlock User"]
+            @AppLocalization["Unlock"] @AppLocalization[account.ObjectType.ToString()]
         </MudMenuItem>
 
     }
+    if (account.Enabled)
+    {
+        <MudMenuItem OnClick="(()=>{UnlockAccount(account);})" Icon="@Icons.Material.Outlined.Cancel">
+            @AppLocalization["Disable"] @AppLocalization[account.ObjectType.ToString()]
+        </MudMenuItem>
+    }
+    if (account.Disabled)
+    {
+        <MudMenuItem OnClick="(()=>{UnlockAccount(account);})" Icon="@Icons.Material.Outlined.Check">
+            @AppLocalization["Enable"] @AppLocalization[account.ObjectType.ToString()]
+        </MudMenuItem>
+    }
 }
 
 <MudMenuItem>