parent
7d5a68b9ae
commit
2f66c041fd
|
|
@ -343,11 +343,7 @@ namespace Microsoft.AspNet.Mvc
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public void Dispose()
|
public void Dispose() => Dispose(disposing: true);
|
||||||
{
|
|
||||||
Dispose(disposing: true);
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Releases all resources currently used by this <see cref="Controller"/> instance.
|
/// Releases all resources currently used by this <see cref="Controller"/> instance.
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,18 @@ using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|
||||||
namespace Microsoft.AspNet.Mvc.Rendering
|
namespace Microsoft.AspNet.Mvc.Rendering
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// An HTML form element in an MVC view.
|
||||||
|
/// </summary>
|
||||||
public class MvcForm : IDisposable
|
public class MvcForm : IDisposable
|
||||||
{
|
{
|
||||||
private readonly ViewContext _viewContext;
|
private readonly ViewContext _viewContext;
|
||||||
private bool _disposed;
|
private bool _disposed;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of <see cref="MvcForm"/>.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="viewContext">The <see cref="ViewContext"/>.</param>
|
||||||
public MvcForm(ViewContext viewContext)
|
public MvcForm(ViewContext viewContext)
|
||||||
{
|
{
|
||||||
if (viewContext == null)
|
if (viewContext == null)
|
||||||
|
|
@ -23,10 +30,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
|
||||||
_viewContext = viewContext;
|
_viewContext = viewContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
Dispose(disposing: true);
|
if (!_disposed)
|
||||||
GC.SuppressFinalize(this);
|
{
|
||||||
|
_disposed = true;
|
||||||
|
GenerateEndForm();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -34,9 +45,13 @@ namespace Microsoft.AspNet.Mvc.Rendering
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void EndForm()
|
public void EndForm()
|
||||||
{
|
{
|
||||||
Dispose(disposing: true);
|
Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Renders <see cref="ViewFeatures.FormContext.EndOfFormContent"/> and
|
||||||
|
/// the </form>.
|
||||||
|
/// </summary>
|
||||||
protected virtual void GenerateEndForm()
|
protected virtual void GenerateEndForm()
|
||||||
{
|
{
|
||||||
RenderEndOfFormContent();
|
RenderEndOfFormContent();
|
||||||
|
|
@ -44,15 +59,6 @@ namespace Microsoft.AspNet.Mvc.Rendering
|
||||||
_viewContext.FormContext = null;
|
_viewContext.FormContext = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (!_disposed)
|
|
||||||
{
|
|
||||||
_disposed = true;
|
|
||||||
GenerateEndForm();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void RenderEndOfFormContent()
|
private void RenderEndOfFormContent()
|
||||||
{
|
{
|
||||||
var formContext = _viewContext.FormContext;
|
var formContext = _viewContext.FormContext;
|
||||||
|
|
|
||||||
|
|
@ -544,11 +544,8 @@ namespace System.Web.Http
|
||||||
return new HttpStatusCodeResult((int)status);
|
return new HttpStatusCodeResult((int)status);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
/// <inheritdoc />
|
||||||
{
|
public void Dispose() => Dispose(disposing: true);
|
||||||
Dispose(true);
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Validates the given entity and adds the validation errors to the <see cref="ApiController.ModelState"/>
|
/// Validates the given entity and adds the validation errors to the <see cref="ApiController.ModelState"/>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue