Merge pull request #3088 from sbwalker/dev

add version to support url
oqtane · Aug 2, 2023 · 4740404 · 4740404
2 parents 1d77ba2 + 3425391
commit 4740404
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -80,7 +80,7 @@ else
                 }
             </td>
             <td>
-                @((MarkupString)SupportLink(context.PackageName))
+                @((MarkupString)SupportLink(context.PackageName, context.Version))
             </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
@@ -145,15 +145,15 @@ else
 		return link;
 	}
 
-    private string SupportLink(string packagename)
+    private string SupportLink(string packagename, string version)
     {
         string link = "";
         if (!string.IsNullOrEmpty(packagename) && _packages != null)
         {
             var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
             if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
             {
-                link += "<a class=\"btn btn-success\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
+                link += "<a class=\"btn btn-success\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl.Replace("{Version}", version) + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
             }
         }
         return link;

diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -49,7 +49,7 @@ else
                 }
             </td>
             <td>
-                @((MarkupString)SupportLink(context.PackageName))
+                @((MarkupString)SupportLink(context.PackageName, context.Version))
             </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
@@ -112,15 +112,15 @@ else
         return link;
     }
 
-    private string SupportLink(string packagename)
+    private string SupportLink(string packagename, string version)
     {
         string link = "";
         if (!string.IsNullOrEmpty(packagename) && _packages != null)
         {
             var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
             if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
             {
-                link += "<a class=\"btn btn-success\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
+                link += "<a class=\"btn btn-success\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl.Replace("{Version}", version) + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
             }
         }
         return link;