fix: Fix go back url in the add/edit task pages

rezaroointan · Mar 19, 2024 · 75a2b3c · 75a2b3c
1 parent 5394d9f
commit 75a2b3c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/DoIt.Blazor/Components/Pages/AddTask.razor b/src/DoIt.Blazor/Components/Pages/AddTask.razor
@@ -13,7 +13,7 @@
 @inject NavigationManager NavigationManager
 @inject IJSRuntime JSRuntime
 
-<PageTitle>AddTask</PageTitle>
+<PageTitle>Add Task</PageTitle>
 
 <div class="container">
 
@@ -67,7 +67,7 @@
 
         <!-- Buttons -->
         <div class="modal-footer">
-            <a @onclick="GoBackAsync" class="btn btn-secondary">Back</a>
+            <a onclick="history.back();" class="btn btn-secondary">Back</a>
             <button type="submit" class="btn btn-primary">Add</button>
         </div>
     </EditForm>
@@ -102,12 +102,12 @@
 
         if(result != 0)
         {
-            NavigationManager.NavigateTo(ReturnUrl, false);
+            NavigationManager.NavigateTo(ReturnUrl);
         }
     }
 
     private async Task GoBackAsync()
     {
-        NavigationManager.NavigateTo(ReturnUrl, false);
+        await JSRuntime.InvokeVoidAsync("history.back()");
     }
 }
diff --git a/src/DoIt.Blazor/Components/Pages/EditTask.razor b/src/DoIt.Blazor/Components/Pages/EditTask.razor
@@ -68,7 +68,7 @@
 
         <!-- Buttons -->
         <div class="modal-footer">
-            <a href="/Inbox" class="btn btn-secondary">Back</a>
+            <a @onclick="GoBack" class="btn btn-secondary">Back</a>
             <button type="button" data-bs-toggle="modal" data-bs-target="#deleteTask" class="btn btn-danger">Delete</button>
             <button type="submit" class="btn btn-primary">Edit</button>
         </div>
@@ -119,7 +119,7 @@
 
         if(result != 0)
         {
-            NavigationManager.NavigateTo(ReturnUrl);
+            GoBack();
         }
     }
 
@@ -129,7 +129,12 @@
 
         if (result != 0)
         {
-            NavigationManager.NavigateTo(ReturnUrl);
+            GoBack();
         }
     }
+
+    private void GoBack()
+    {
+        NavigationManager.NavigateTo(ReturnUrl);
+    }
 }