Merge pull request #129 from Blazam-App/Beta-Dev

Fix for only being able to apply an action to one object type
Blazam-App · Jul 27, 2023 · 0c36d95 · 0c36d95
2 parents 3f8a04e + 470929f
commit 0c36d95
Show file tree

Hide file tree

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

diff --git a/BLAZAMGui/UI/Settings/Permissions/EditAccessLevel.razor b/BLAZAMGui/UI/Settings/Permissions/EditAccessLevel.razor
@@ -90,7 +90,7 @@
                                 {
                                     if (action.IsActionAppropriateForObject(objectMap.ObjectType))
                                     {
-                                        if (!WorkingModel.ActionMap.Any(a => a.ObjectAction == action))
+                                        if (!WorkingModel.ActionMap.Any(a => a.ObjectType==objectMap.ObjectType && a.ObjectAction == action))
                                         {
 
 

diff --git a/BLAZAMGui/UI/Settings/Permissions/PermissionMapEditor.razor b/BLAZAMGui/UI/Settings/Permissions/PermissionMapEditor.razor
@@ -42,9 +42,9 @@
                         <MudButton Disabled Color="Color.Secondary">@pd</MudButton>
                     }
                 }
-                @if (_accessLevels != null)
+                @if (_map?.AccessLevels != null)
                 {
-                    @foreach (var al in _accessLevels)
+                    @foreach (var al in _map.AccessLevels)
                     {
                         <MudButton Disabled Color="Color.Secondary">@al.Name</MudButton>
                     }

diff --git a/BLAZAMUpdate/ApplicationUpdate.cs b/BLAZAMUpdate/ApplicationUpdate.cs
@@ -172,7 +172,8 @@ public async Task<bool> Prepare()
 
         public async Task<string> Apply()
         {
-            cancellationTokenSource = new CancellationTokenSource();
+            if (cancellationTokenSource == null || cancellationTokenSource.IsCancellationRequested)
+                cancellationTokenSource = new CancellationTokenSource();
 
             OnUpdateStarted?.Invoke();
             if (!await Prepare())
@@ -410,7 +411,7 @@ public async Task<bool> Stage()
         }
         public void Cancel()
         {
-            cancellationTokenSource.Cancel();
+            cancellationTokenSource?.Cancel();
         }
         public async Task<bool> Download()
         {
@@ -447,7 +448,7 @@ public async Task<bool> Download()
 
                             while ((bytesRead = await streamToReadFrom.ReadAsync(buffer, 0, buffer.Length)) > 0)
                             {
-                                if (cancellationTokenSource?.IsCancellationRequested!=true)
+                                if (cancellationTokenSource?.IsCancellationRequested != true)
                                 {
                                     await streamToWriteTo.WriteAsync(buffer, 0, bytesRead);
                                     totalBytesRead += bytesRead;