From a3cdaba5da6cf4403a260fd34ad29ab1ef755b75 Mon Sep 17 00:00:00 2001
From: deepchoudhery <decho@microsoft.com>
Date: Fri, 2 Sep 2022 12:41:32 -0700
Subject: [PATCH] fixing controller templates.

---
 .../ApiControllerWithContext.cshtml                    | 10 +++++-----
 .../MvcControllerWithContext.cshtml                    |  4 ++--
 .../Bootstrap5/CreatePageModel.cshtml                  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/ApiControllerWithContext.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/ApiControllerWithContext.cshtml
index cc1b75618..34b4f5b65 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/ApiControllerWithContext.cshtml
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/ApiControllerWithContext.cshtml
@@ -39,7 +39,7 @@ namespace @Model.ControllerNamespace
         public async Task<ActionResult<IEnumerable<@(Model.ModelTypeName)>>> Get@(entitySetName)()
         {
 @{
-        if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
+        if (@Model.NullableEnabled)
         {
           @:if (_context.@(entitySetName) == null)
           @:{
@@ -55,7 +55,7 @@ namespace @Model.ControllerNamespace
         public async Task<ActionResult<@(Model.ModelTypeName)>> Get@(Model.ModelTypeName)(@primaryKeyShortTypeName id)
         {
 @{
-        if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
+        if (@Model.NullableEnabled)
         {
           @:if (_context.@(entitySetName) == null)
           @:{
@@ -110,7 +110,7 @@ namespace @Model.ControllerNamespace
         public async Task<ActionResult<@(Model.ModelTypeName)>> Post@(Model.ModelTypeName)(@Model.ModelTypeName @Model.ModelVariable)
         {
 @{
-        if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
+        if (@Model.NullableEnabled)
         {
           @:if (_context.@(entitySetName) == null)
           @:{
@@ -152,7 +152,7 @@ namespace @Model.ControllerNamespace
         public async Task<IActionResult> Delete@(Model.ModelTypeName)(@primaryKeyShortTypeName id)
         {
 @{
-        if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
+        if (@Model.NullableEnabled)
         {
             @:if (_context.@(entitySetName) == null)
             @:{
@@ -175,7 +175,7 @@ namespace @Model.ControllerNamespace
         private bool @(Model.ModelTypeName)Exists(@primaryKeyShortTypeName id)
         {
 @{
-        if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
+        if (@Model.NullableEnabled)
         {
             @:return (_context.@(entitySetName)?.Any(e => e.@primaryKeyName == id)).GetValueOrDefault();
         }
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/MvcControllerWithContext.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/MvcControllerWithContext.cshtml
index a55e9b0a2..6b0f2a39c 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/MvcControllerWithContext.cshtml
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/MvcControllerWithContext.cshtml
@@ -89,7 +89,7 @@ namespace @Model.ControllerNamespace
     }
     else
     {
-            if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
+            if (@Model.NullableEnabled)
             {
               @:return _context.@entitySetName != null ? 
                         @:  View(await _context.@(entitySetName).ToListAsync()) :
@@ -261,7 +261,7 @@ namespace @Model.ControllerNamespace
         private bool @(Model.ModelTypeName)Exists(@primaryKeyShortTypeName id)
         {
     @{
-        if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
+        if (@Model.NullableEnabled)
         {
           @:return (_context.@(entitySetName)?.Any(e => e.@primaryKeyName == id)).GetValueOrDefault();
         }
diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/CreatePageModel.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/CreatePageModel.cshtml
index dcc744b64..136850075 100644
--- a/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/CreatePageModel.cshtml
+++ b/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/CreatePageModel.cshtml
@@ -50,7 +50,7 @@ namespace @Model.NamespaceName
         }
 
 @{
-    if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
+        if ("enable".Equals(@Model.NullableEnabled, StringComparison.OrdinalIgnoreCase))
         {
         @:[BindProperty]
         @:public @Model.ViewDataTypeShortName @Model.ViewDataTypeShortName { get; set; } = default!;