From 68a95b29952d592014b0e3c952f0e1cec883ec85 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Sat, 9 Jul 2022 00:34:14 +0300
Subject: [PATCH 1/4] Fix tenant status filter

---
 .../OrchardCore.Tenants/Views/Admin/Index.cshtml              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
index b74d8bd7cb0..da86411c12f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
@@ -100,6 +100,8 @@
         </li>
         @if (Model.ShellSettingsEntries.Count > 0)
         {
+            var requestPath = FullRequestPath + (FullRequestPath.Contains('?') ? "&": "?");
+
             @foreach (var entry in Model.ShellSettingsEntries)
             {
                 <li class="list-group-item">
@@ -123,7 +125,7 @@
                                 {
                                     <span class="badge ta-badge font-weight-normal"><i class="fa fa-image text-info" aria-hidden="true"></i> @entry.ShellSettings["RecipeName"]</span>
                                 }
-                                <a href="@FullRequestPath&Options.Filter=@entry.ShellSettings.State">
+                                <a href="@(requestPath)Options.Status=@entry.ShellSettings.State">
                                     @switch (entry.ShellSettings.State)
                                     {
                                         case TenantState.Uninitialized:

From 36b65d008369cb3a617e899df06938be1b20448b Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Sat, 9 Jul 2022 15:45:44 +0300
Subject: [PATCH 2/4] Use simple route attribue

Co-authored-by: Jasmin Savard <jasmin.savard@gmail.com>
---
 .../OrchardCore.Tenants/Views/Admin/Index.cshtml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
index da86411c12f..94304e25e35 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
@@ -125,7 +125,7 @@
                                 {
                                     <span class="badge ta-badge font-weight-normal"><i class="fa fa-image text-info" aria-hidden="true"></i> @entry.ShellSettings["RecipeName"]</span>
                                 }
-                                <a href="@(requestPath)Options.Status=@entry.ShellSettings.State">
+                                <a asp-controller="Admin" asp-action="Index" asp-route-Options.Status="@entry.ShellSettings.State">
                                     @switch (entry.ShellSettings.State)
                                     {
                                         case TenantState.Uninitialized:

From 268bb4511d320816ed38b17826bcb924c1e79c00 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Sat, 9 Jul 2022 15:46:26 +0300
Subject: [PATCH 3/4] Remove unnecessary changes

Co-authored-by: Jasmin Savard <jasmin.savard@gmail.com>
---
 .../OrchardCore.Tenants/Views/Admin/Index.cshtml                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
index 94304e25e35..c56280df250 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
@@ -100,7 +100,6 @@
         </li>
         @if (Model.ShellSettingsEntries.Count > 0)
         {
-            var requestPath = FullRequestPath + (FullRequestPath.Contains('?') ? "&": "?");
 
             @foreach (var entry in Model.ShellSettingsEntries)
             {

From 1f9f23530ef1b925ce3f995eb56923d22bee3dfe Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Sat, 9 Jul 2022 15:59:21 +0300
Subject: [PATCH 4/4] Remove extra line

---
 .../OrchardCore.Tenants/Views/Admin/Index.cshtml                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
index c56280df250..2f4a53feef3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
@@ -100,7 +100,6 @@
         </li>
         @if (Model.ShellSettingsEntries.Count > 0)
         {
-
             @foreach (var entry in Model.ShellSettingsEntries)
             {
                 <li class="list-group-item">