Skip to content

Commit 066e958

Browse files
VicTachevVicTachev
committed
chore: update example to 2018.3.1117
1 parent fd60184 commit 066e958

File tree

7 files changed

+36
-30
lines changed

7 files changed

+36
-30
lines changed

‎grid/grid-foreignkey-sorting/ForeignKeySorting/ForeignKeySorting.csproj‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="Kendo.Mvc, Version=2016.3.914.545, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
47+
<Reference Include="Kendo.Mvc, Version=2018.3.1017.545, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\lib\KENDOUIMVC\2018.1.117 Trial\Kendo.Mvc.dll</HintPath>
49+
<HintPath>..\lib\KENDOUIMVC\2018.3.117 Trial\Kendo.Mvc.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Microsoft.CSharp" />
5252
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -68,31 +68,31 @@
6868
<Reference Include="System.Core" />
6969
<Reference Include="System.Data.DataSetExtensions" />
7070
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
71+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
74-
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
74+
<Reference Include="System.Web.Mvc, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
7878
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7979
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
8282
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
83+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll</HintPath>
8484
<Private>True</Private>
8585
</Reference>
8686
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
87+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll</HintPath>
8888
<Private>True</Private>
8989
</Reference>
9090
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
91+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
9292
<Private>True</Private>
9393
</Reference>
9494
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
95+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
9696
<Private>True</Private>
9797
</Reference>
9898
<Reference Include="System.Xml.Linq" />
@@ -122,6 +122,7 @@
122122
<Compile Include="Properties\AssemblyInfo.cs" />
123123
</ItemGroup>
124124
<ItemGroup>
125+
<Content Include="bin\Kendo.Mvc.dll" />
125126
<Content Include="Content\bootstrap-theme.css" />
126127
<Content Include="Content\bootstrap-theme.min.css" />
127128
<Content Include="Content\bootstrap.css" />
@@ -164,9 +165,7 @@
164165
<Content Include="Views\Home\About.cshtml" />
165166
<Content Include="Views\Home\Index.cshtml" />
166167
</ItemGroup>
167-
<ItemGroup>
168-
<Folder Include="bin\" />
169-
</ItemGroup>
168+
<ItemGroup />
170169
<ItemGroup>
171170
<Content Include="Scripts\jquery-1.10.2.min.map" />
172171
</ItemGroup>

‎grid/grid-foreignkey-sorting/ForeignKeySorting/Views/Home/Index.cshtml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
});
1313
columns.Bound(p => p.ProductID);
1414
columns.Bound(p => p.ProductName);
15+
columns.Bound(p => p.CategoryID);
1516
columns.ForeignKey(p => p.CategoryID, (System.Collections.IEnumerable)ViewData["categories"],
1617
"CategoryID", "CategoryName").Title("Category").Filterable(f=>f.Extra(false));
1718
})
@@ -29,4 +30,10 @@
2930
.Update(update => update.Action("Update", "Home"))
3031
)
3132
)
32-
33+
<script>
34+
$(function () {
35+
var grid = $("#grid").data("kendoGrid");
36+
var menu = grid.thead.find("th[data-field='CategoryID']").attr("data-field", "CategoryName").data("kendoColumnMenu");
37+
menu.field = "CategoryName";
38+
});
39+
</script>

‎grid/grid-foreignkey-sorting/ForeignKeySorting/Views/Shared/_Layout.cshtml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<head>
44
<title>@ViewBag.Title</title>
55

6-
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2018.1.117/styles/kendo.common.min.css">
7-
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2018.1.117/styles/kendo.default.min.css">
6+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2018.3.1017/styles/kendo.common.min.css">
7+
<link rel="stylesheet" href="https://kendo.cdn.telerik.com/2018.3.1017/styles/kendo.default.min.css">
88

99
<script src="https://code.jquery.com/jquery-1.12.3.min.js"></script>
10-
<script src="https://kendo.cdn.telerik.com/2018.1.117/js/jszip.min.js"></script>
11-
<script src="https://kendo.cdn.telerik.com/2018.1.117/js/kendo.all.min.js"></script>
12-
<script src="https://kendo.cdn.telerik.com/2018.1.117/js/kendo.aspnetmvc.min.js"></script>
10+
<script src="https://kendo.cdn.telerik.com/2018.3.1017/js/jszip.min.js"></script>
11+
<script src="https://kendo.cdn.telerik.com/2018.3.1017/js/kendo.all.min.js"></script>
12+
<script src="https://kendo.cdn.telerik.com/2018.3.1017/js/kendo.aspnetmvc.min.js"></script>
1313
</head>
1414

1515
<body>

‎grid/grid-foreignkey-sorting/ForeignKeySorting/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<package id="Antlr" version="3.4.1.9004" targetFramework="net452" />
44
<package id="bootstrap" version="3.3.2" targetFramework="net452" />
55
<package id="jQuery" version="1.10.2" targetFramework="net452" />
6-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
7-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
6+
<package id="Microsoft.AspNet.Mvc" version="5.2.6" targetFramework="net452" />
7+
<package id="Microsoft.AspNet.Razor" version="3.2.6" targetFramework="net452" />
88
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net452" />
9-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
9+
<package id="Microsoft.AspNet.WebPages" version="3.2.6" targetFramework="net452" />
1010
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
1111
<package id="Modernizr" version="2.6.2" targetFramework="net452" />
1212
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" />

‎grid/grid-foreignkey-sorting/ForeignKeySorting/web.config‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919
</system.web>
2020
<runtime>
2121
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
22+
<dependentAssembly>
23+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
24+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
25+
</dependentAssembly>
26+
<dependentAssembly>
27+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
28+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
29+
</dependentAssembly>
2230
<dependentAssembly>
2331
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
2432
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
@@ -29,15 +37,7 @@
2937
</dependentAssembly>
3038
<dependentAssembly>
3139
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
32-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
33-
</dependentAssembly>
34-
<dependentAssembly>
35-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
36-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
37-
</dependentAssembly>
38-
<dependentAssembly>
39-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
40-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
40+
<bindingRedirect oldVersion="1.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
4141
</dependentAssembly>
4242
</assemblyBinding>
4343
</runtime>

‎grid/grid-foreignkey-sorting/lib/KENDOUIMVC/2018.1.117 Trial/Kendo.Mvc.dll‎

-2.02 MB
Binary file not shown.

‎grid/grid-foreignkey-sorting/lib/KENDOUIMVC/2018.3.117 Trial/Kendo.Mvc.dll‎

2.12 MB
Binary file not shown.

0 commit comments

Comments
 (0)