From 423f17f4eba18198df5da10f0ffa626e5eaa4b41 Mon Sep 17 00:00:00 2001 From: dxstanley Date: Thu, 19 Dec 2019 19:05:10 +0300 Subject: [PATCH] add branch 19.1 --- CS/E4924.sln | 10 ++-- CS/E4924/E4924.csproj | 55 +++++++-------------- CS/E4924/Global.asax.cs | 2 +- CS/E4924/Models/Person.cs | 2 +- CS/E4924/Properties/AssemblyInfo.cs | 2 +- CS/E4924/Views/Home/_GridViewPartial.cshtml | 4 +- CS/E4924/Views/Shared/_Layout.cshtml | 4 +- CS/E4924/Web.config | 44 ++++++++++------- VB/E4924/E4924.vbproj | 36 +++----------- VB/E4924/Global.asax.vb | 2 +- VB/E4924/Views/Home/_GridViewPartial.vbhtml | 3 +- VB/E4924/Web.config | 42 +++++++++------- 12 files changed, 87 insertions(+), 119 deletions(-) diff --git a/CS/E4924.sln b/CS/E4924.sln index 577dcf2..5fa03d0 100644 --- a/CS/E4924.sln +++ b/CS/E4924.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "E4924", "E4924\E4924.csproj", "{0C077B64-2C7D-4BC9-BF9B-C01F1B36AD31}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "E4924", "E4924\E4924.csproj", "{9603BF5F-DC46-480C-BE9E-1789A877A342}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0C077B64-2C7D-4BC9-BF9B-C01F1B36AD31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C077B64-2C7D-4BC9-BF9B-C01F1B36AD31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C077B64-2C7D-4BC9-BF9B-C01F1B36AD31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C077B64-2C7D-4BC9-BF9B-C01F1B36AD31}.Release|Any CPU.Build.0 = Release|Any CPU + {9603BF5F-DC46-480C-BE9E-1789A877A342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9603BF5F-DC46-480C-BE9E-1789A877A342}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9603BF5F-DC46-480C-BE9E-1789A877A342}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9603BF5F-DC46-480C-BE9E-1789A877A342}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CS/E4924/E4924.csproj b/CS/E4924/E4924.csproj index 56a52d7..6ea915a 100644 --- a/CS/E4924/E4924.csproj +++ b/CS/E4924/E4924.csproj @@ -4,9 +4,10 @@ Debug AnyCPU - + + 2.0 - {0C077B64-2C7D-4BC9-BF9B-C01F1B36AD31} + {9603BF5F-DC46-480C-BE9E-1789A877A342} {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties @@ -14,7 +15,8 @@ E4924 v4.7.2 false - + + 4.0 true @@ -23,7 +25,6 @@ - true @@ -143,34 +144,13 @@ - - False - bin\Debug\DevExpress.Data.v14.1.dll - - - False - bin\Debug\DevExpress.Web.ASPxThemes.v14.1.dll - - - False - bin\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\Debug\DevExpress.Web.v14.1.dll - - - False - bin\Debug\DevExpress.Web.Mvc5.v14.1.dll - + + + + + + + ..\packages\Microsoft.AspNet.WebPages.Data.3.2.3\lib\net45\WebMatrix.Data.dll True @@ -223,9 +203,7 @@ - - Designer - + @@ -274,12 +252,13 @@ True True - 51396 + 53712 / - http://localhost:51396/ + http://localhost:53712/ False False - + + False diff --git a/CS/E4924/Global.asax.cs b/CS/E4924/Global.asax.cs index a99f553..5ae2487 100644 --- a/CS/E4924/Global.asax.cs +++ b/CS/E4924/Global.asax.cs @@ -20,7 +20,7 @@ protected void Application_Start() { ModelBinders.Binders.DefaultBinder = new DevExpress.Web.Mvc.DevExpressEditorsBinder(); - DevExpress.Web.ASPxClasses.ASPxWebControl.CallbackError += Application_Error; + DevExpress.Web.ASPxWebControl.CallbackError += Application_Error; } protected void Application_Error(object sender, EventArgs e) { diff --git a/CS/E4924/Models/Person.cs b/CS/E4924/Models/Person.cs index 0be501e..8167b75 100644 --- a/CS/E4924/Models/Person.cs +++ b/CS/E4924/Models/Person.cs @@ -13,7 +13,7 @@ public class Person [Required] public string Name { set; get; } public string CompanyName { set; get; } - [Custom(MinAge=18)] + [Custom(MinAge = 18)] public DateTime BirthDate { set; get; } public bool CheckAge { set; get; } } diff --git a/CS/E4924/Properties/AssemblyInfo.cs b/CS/E4924/Properties/AssemblyInfo.cs index 0dea3a2..5925719 100644 --- a/CS/E4924/Properties/AssemblyInfo.cs +++ b/CS/E4924/Properties/AssemblyInfo.cs @@ -20,7 +20,7 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("83d2ddf7-946a-4c4a-9af2-66f18eda6894")] +[assembly: Guid("07a5e8a5-6ac0-474f-9946-18798a3df88e")] // Version information for an assembly consists of the following four values: // diff --git a/CS/E4924/Views/Home/_GridViewPartial.cshtml b/CS/E4924/Views/Home/_GridViewPartial.cshtml index 9ad52f0..8bf708e 100644 --- a/CS/E4924/Views/Home/_GridViewPartial.cshtml +++ b/CS/E4924/Views/Home/_GridViewPartial.cshtml @@ -1,6 +1,4 @@ @model IList -@using DevExpress.Web.ASPxEditors -@using DevExpress.Web.ASPxGridView @{ var grid = Html.DevExpress().GridView(settings => @@ -52,4 +50,4 @@ grid.SetEditErrorText((string)ViewData["EditError"]); } } -@grid.Bind(Model).GetHtml() \ No newline at end of file +@grid.Bind(Model).GetHtml() diff --git a/CS/E4924/Views/Shared/_Layout.cshtml b/CS/E4924/Views/Shared/_Layout.cshtml index d00e1d0..edbc63f 100644 --- a/CS/E4924/Views/Shared/_Layout.cshtml +++ b/CS/E4924/Views/Shared/_Layout.cshtml @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ new StyleSheet { ExtensionSuite = ExtensionSuite.Editors }, new StyleSheet { ExtensionSuite = ExtensionSuite.GridView } ) - @Html.DevExpress().GetScripts( + @Html.DevExpress().GetScripts( new Script { ExtensionSuite = ExtensionSuite.NavigationAndLayout }, new Script { ExtensionSuite = ExtensionSuite.Editors }, new Script { ExtensionSuite = ExtensionSuite.GridView } diff --git a/CS/E4924/Web.config b/CS/E4924/Web.config index dd2d502..5f33580 100644 --- a/CS/E4924/Web.config +++ b/CS/E4924/Web.config @@ -6,14 +6,15 @@ -
-
-
-
+
+
+
+
+
- + @@ -28,12 +29,13 @@ - - - - - - + + + + + + + @@ -54,11 +56,11 @@ - - + + - + @@ -67,13 +69,13 @@ - + - - + + @@ -98,9 +100,13 @@ - + + + + + - + \ No newline at end of file diff --git a/VB/E4924/E4924.vbproj b/VB/E4924/E4924.vbproj index ec777c0..29c2e6c 100644 --- a/VB/E4924/E4924.vbproj +++ b/VB/E4924/E4924.vbproj @@ -148,34 +148,14 @@ - - False - bin\Debug\DevExpress.Data.v14.1.dll - - - False - bin\Debug\DevExpress.Web.ASPxThemes.v14.1.dll - - - False - bin\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\Debug\DevExpress.Web.v14.1.dll - - - False - bin\Debug\DevExpress.Web.Mvc5.v14.1.dll - + + + + + + + + ..\packages\Microsoft.AspNet.WebPages.Data.3.2.3\lib\net45\WebMatrix.Data.dll True diff --git a/VB/E4924/Global.asax.vb b/VB/E4924/Global.asax.vb index 56621a1..2908fcf 100644 --- a/VB/E4924/Global.asax.vb +++ b/VB/E4924/Global.asax.vb @@ -14,7 +14,7 @@ Public Class MvcApplication ModelBinders.Binders.DefaultBinder = new DevExpress.Web.Mvc.DevExpressEditorsBinder() - AddHandler DevExpress.Web.ASPxClasses.ASPxWebControl.CallbackError, AddressOf Application_Error + AddHandler DevExpress.Web.ASPxWebControl.CallbackError, AddressOf Application_Error End Sub Protected Sub Application_Error(ByVal sender As Object, ByVal e As EventArgs) diff --git a/VB/E4924/Views/Home/_GridViewPartial.vbhtml b/VB/E4924/Views/Home/_GridViewPartial.vbhtml index f6064a1..76d2ead 100644 --- a/VB/E4924/Views/Home/_GridViewPartial.vbhtml +++ b/VB/E4924/Views/Home/_GridViewPartial.vbhtml @@ -1,6 +1,4 @@ @ModelType IList(Of E4924.Person) -@Imports DevExpress.Web.ASPxEditors -@Imports Devexpress.Web.ASPxGridView @Code Dim grid = Html.DevExpress().GridView(Sub(settings) @@ -12,6 +10,7 @@ settings.SettingsEditing.DeleteRowRouteValues = New With {.Controller = "Home", .Action = "GridViewPartialDelete"} settings.SettingsEditing.Mode = GridViewEditingMode.EditFormAndDisplayRow + settings.SettingsEditing.ShowModelErrorsForEditors = True settings.SettingsBehavior.ConfirmDelete = True diff --git a/VB/E4924/Web.config b/VB/E4924/Web.config index 4dfbeb8..2086f67 100644 --- a/VB/E4924/Web.config +++ b/VB/E4924/Web.config @@ -6,10 +6,11 @@ -
-
-
-
+
+
+
+
+
@@ -28,12 +29,13 @@ - - - - - - + + + + + + + @@ -54,11 +56,11 @@ - - + + - + @@ -67,13 +69,13 @@ - + - - + + @@ -98,9 +100,13 @@ - + + + + + - + \ No newline at end of file