Skip to content

Commit cd67d3d

Browse files
committed
Merge branch 'master' of https://github.com/aspnetzero/documents
2 parents dfbbb2d + ca8840c commit cd67d3d

4 files changed

+18
-13
lines changed

docs/en/DevExpress-Reporting-Implementation.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
3838

3939
```json
4040
dependencies: [
41-
"devextreme": "20.2.5",
42-
"@devexpress/analytics-core": "20.2.5",
43-
"devexpress-reporting": "20.2.5",
44-
"jquery-ui-dist": "1.12.1"
41+
"devextreme": "21.2.*",
42+
"@devexpress/analytics-core": "21.2.*",
43+
"devexpress-reporting": "21.2.*",
44+
"jquery-ui-dist": "^1.12.1"
4545
]
4646
```
4747

@@ -85,7 +85,16 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
8585

8686
![header-scripts](images/devexpress-reporting-header-scripts.png)
8787

88-
11. Create new controller named `SampleReportController` in MVC project's Areas/App folder.
88+
11. Create new controller named `CustomWebDocumentViwerController` for devexpress in MVC project's Areas/App folder.
89+
90+
```csharp
91+
public class CustomWebDocumentViewerController : WebDocumentViewerController
92+
{
93+
public CustomWebDocumentViewerController(IWebDocumentViewerMvcControllerService controllerService) : base(controllerService) { }
94+
}
95+
```
96+
97+
12. Create new controller named `SampleReportController` in MVC project's Areas/App folder.
8998

9099
```csharp
91100
[Area("App")]
@@ -98,7 +107,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
98107
}
99108
```
100109

101-
12. Create `Index.cshtml` and add following code into it.
110+
13. Create `Index.cshtml` and add following code into it.
102111

103112
```cshtml
104113
@using DevExpress.AspNetCore
@@ -135,8 +144,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
135144

136145
Your reporting file is ready to use.
137146

138-
Note: If you get a reference error about `WebDocumentViewerController`, `QueryBuilderController` or `ReportDesignerController`, you can follow the solution below:
139-
140147
* Go to you `[YOURAPPNAME]WebMvcModule` .
141148

142149
* Add following code into `PreInitialize` function
@@ -145,9 +152,7 @@ Note: If you get a reference error about `WebDocumentViewerController`, `QueryBu
145152
public override void PreInitialize()
146153
{
147154
//...
148-
IocManager.Register(typeof(WebDocumentViewerController), DependencyLifeStyle.Transient);
149-
IocManager.Register(typeof(QueryBuilderController), DependencyLifeStyle.Transient);
150-
IocManager.Register(typeof(ReportDesignerController), DependencyLifeStyle.Transient);
155+
IocManager.Register(typeof(CustomWebDocumentViewerController), DependencyLifeStyle.Transient);
151156
}
152157
```
153158

Loading

docs/en/nav-aspnet-core-angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
"path": "Features-Angular-User-Delegation.md"
209209
},
210210
{
211-
"text": "Dynamic Entity Parameters",
211+
"text": "Dynamic Property System",
212212
"path": "Feature-Dynamic-Entity-Parameters-Angular.md",
213213
"items": [
214214
{

docs/en/nav-aspnet-core-mvc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
"path": "Features-Mvc-Core-User-Delegation.md"
199199
},
200200
{
201-
"text": "Dynamic Entity Parameters",
201+
"text": "Dynamic Property System",
202202
"path": "Feature-Dynamic-Entity-Parameters-Mvc.md",
203203
"items": [
204204
{

0 commit comments

Comments
 (0)