Merge branch 'main' into msalem/fix_scheduler_button

Azure · Dec 27, 2023 · 948cd8c · 948cd8c
2 parents 96a8702 + b24c563
commit 948cd8c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/docs/Installation-Instructions.md b/docs/Installation-Instructions.md
@@ -29,7 +29,7 @@ Copy the following section to an editor and update it to match your company pref
 ``` powershell
 wget https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh; `
 chmod +x dotnet-install.sh; `
-./dotnet-install.sh --channel 6.0; `
+./dotnet-install.sh -version 6.0.417; `
 $ENV:PATH="$HOME/.dotnet:$ENV:PATH"; `
 dotnet tool install --global dotnet-ef --version 6.0.1; `
 git clone https://github.com/Azure/Commercial-Marketplace-SaaS-Accelerator.git -b 7.4.0 --depth 1; `
@@ -74,7 +74,7 @@ If you already have deployed the SaaS Accelerator, but you want to update it so
 ``` powershell
 wget https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh; `
 chmod +x dotnet-install.sh; `
-./dotnet-install.sh --channel 6.0; `
+./dotnet-install.sh -version 6.0.417; `
 $ENV:PATH="$HOME/.dotnet:$ENV:PATH"; `
 dotnet tool install --global dotnet-ef --version 6.0.1; `
 git clone https://github.com/Azure/Commercial-Marketplace-SaaS-Accelerator.git -b <release-version-branch-to-deploy> --depth 1; `

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "6.0.417"
+  }
+}
diff --git a/src/AdminSite/Controllers/ApplicationConfigController.cs b/src/AdminSite/Controllers/ApplicationConfigController.cs
@@ -121,6 +121,7 @@ public IActionResult ApplicationConfigDetails(int Id)
     [ValidateAntiForgeryToken]
     public IActionResult ApplicationConfigDetails(ApplicationConfiguration appConfig)
     {
+        appConfig.Value = appConfig.Value ?? string.Empty;
         this.appConfigService.SaveAppConfig(appConfig);
 
         this.ModelState.Clear();

diff --git a/src/AdminSite/Views/ApplicationConfig/ApplicationConfigDetails.cshtml b/src/AdminSite/Views/ApplicationConfig/ApplicationConfigDetails.cshtml
@@ -25,7 +25,7 @@
                         @Model.Name
                     </td>
                     <td>
-                        @if (@Model.Name.Equals("SMTPPassword") && @Model.Value.Length > 5)
+                        @if (@Model.Name.Equals("SMTPPassword") && @Model?.Value?.Length > 5)
                         {
                             @Html.EditorFor(model => model.Value, new { htmlAttributes = new { type ="password", @class = "form-control" } })
                         }

diff --git a/src/AdminSite/Views/ApplicationConfig/Index.cshtml b/src/AdminSite/Views/ApplicationConfig/Index.cshtml
@@ -31,7 +31,7 @@
                                         @item.Name
                                     </td>
                                     <td class="text-left">
-                                        @if (@item.Name.Equals("SMTPPassword") && @item.Value.Length > 5)
+                                        @if (@item.Name.Equals("SMTPPassword") && @item?.Value?.Length > 5)
                                         {
                                             @String.Format("{0}{1}", @item.Value.Substring(0,5), "****************");
                                         }