Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22469
Modified Files:
ValidationError.cs ValidationSummary.cs
Log Message:
SPRNET-558 - Enable Data Validation Rendering UserControl (.NET 2.0 only)
Index: ValidationSummary.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ValidationSummary.cs 26 Feb 2008 21:21:26 -0000 1.9
--- ValidationSummary.cs 26 Feb 2008 22:33:37 -0000 1.10
***************
*** 98,102 ****
{
IList errorMessages;
!
System.Type t = typeof(Spring.Web.UI.Page);
--- 98,104 ----
{
IList errorMessages;
! #if NET_1_1
! errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
! #else
System.Type t = typeof(Spring.Web.UI.Page);
***************
*** 112,116 ****
errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
}
!
Renderer.RenderErrors(Page, writer, errorMessages);
}
--- 114,118 ----
errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
}
! #endif
Renderer.RenderErrors(Page, writer, errorMessages);
}
Index: ValidationError.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ValidationError.cs 26 Feb 2008 21:21:26 -0000 1.9
--- ValidationError.cs 26 Feb 2008 22:33:37 -0000 1.10
***************
*** 99,103 ****
System.Type t = typeof(Spring.Web.UI.Page);
!
if (this.TemplateControl != null) t = this.TemplateControl.GetType();
--- 99,105 ----
System.Type t = typeof(Spring.Web.UI.Page);
! #if NET_1_1
! errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
! #else
if (this.TemplateControl != null) t = this.TemplateControl.GetType();
***************
*** 111,114 ****
--- 113,117 ----
errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
}
+ #endif
Renderer.RenderErrors(Page, writer, errorMessages);
|
