Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Loneve/filter #3058

Merged
merged 2 commits into from Jan 21, 2019
Merged

Loneve/filter #3058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
832521e
Manage Content Search text (#3055)
Loneve Jan 18, 2019
13e4354
Update List.cshtml (#3054)
Loneve Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs
View file
Open in desktop
Expand Up @@ -168,7 +168,10 @@ public async Task<IActionResult> List(ListContentsViewModel model, PagerParamete
if (maxPagedCount > 0 && pager.PageSize > maxPagedCount)
pager.PageSize = maxPagedCount;

var pagerShape = (await New.Pager(pager)).TotalItemCount(maxPagedCount > 0 ? maxPagedCount : await query.CountAsync());
var routeData = new RouteData();
routeData.Values.Add("DisplayText", model.DisplayText);

var pagerShape = (await New.Pager(pager)).TotalItemCount(maxPagedCount > 0 ? maxPagedCount : await query.CountAsync()).RouteData(routeData);
var pageOfContentItems = await query.Skip(pager.GetStartIndex()).Take(pager.PageSize).ListAsync();

var contentItemSummaries = new List<dynamic>();
Expand All @@ -181,7 +184,8 @@ public async Task<IActionResult> List(ListContentsViewModel model, PagerParamete
.ContentItems(contentItemSummaries)
.Pager(pagerShape)
.Options(model.Options)
.TypeDisplayName(model.TypeDisplayName ?? "");
.TypeDisplayName(model.TypeDisplayName ?? "")
.DisplayText(model.DisplayText ?? "");

return View(viewModel);
}
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/List.cshtml
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ new SelectListItem() { Text = T["title"].Value, Value = ContentsOrder.Title.ToSt
<label for="DisplayText" class="label col-form-label">@T["Title"]</label>
</div>
<div class="col-md-4 col-xl-2 form-group">
<input id="DisplayText" class="form-control" name="DisplayText" />
<input id="DisplayText" class="form-control" name="DisplayText" value="@Model.DisplayText" />
</div>
<div class="col-md-2 col-xl-1 form-group">
<label for="contentResults" class="label col-form-label">@T["Filter"]</label>
Expand Down