Skip to content

fixing controller templates #2010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepchoudhery merged 1 commit into from
Sep 2, 2022
Merged

fixing controller templates #2010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/ApiControllerWithContext.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
@:{
Expand All @@ -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)
@:{
Expand Down Expand Up @@ -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)
@:{
Expand Down Expand Up @@ -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)
@:{
Expand All @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions src/Scaffolding/VS.Web.CG.Mvc/Templates/ControllerGenerator/MvcControllerWithContext.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) :
Expand Down Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/CreatePageModel.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!;
Expand Down