Skip to content

Commit 31d9c2a

Browse files
move SetTagPageNumber to TagsScheduledJob
1 parent 029ce0c commit 31d9c2a

File tree

2 files changed

+17
-24
lines changed

2 files changed

+17
-24
lines changed

src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ public IActionResult OnPostDelete(string id)
105105
private void Load()
106106
{
107107
SetPageNumberFromQueryString();
108-
SetItemPageNumber();
109108

110109
var items = FindTags().ToPagedList(Paging.PageNumber, Paging.PageSize);
111110
Items = items;
@@ -114,28 +113,7 @@ private void SetPageNumberFromQueryString()
114113
{
115114
if (HttpContext.Request.Query.TryGetValue("pageNumber", out var value) && int.TryParse(value, out var pageNumber))
116115
{
117-
Paging.PageNumber = pageNumber;
118-
}
119-
}
120-
121-
private void SetItemPageNumber()
122-
{
123-
if (string.IsNullOrEmpty(HttpContext.Request.QueryString.ToString()))
124-
{
125-
var allTags = _tagRepository.GetAllTags().ToList();
126-
var pagedList = allTags.ToPagedList();
127-
SetItemPageNumber(pagedList);
128-
}
129-
}
130-
131-
private void SetItemPageNumber(IPagedList<Tag> items)
132-
{
133-
for (var i = 0; i < items.Count; i++)
134-
{
135-
var itemPageNumber = (i / Paging.PageSize) + 1;
136-
var tag = _tagRepository.GetTagById(items[i].Id);
137-
tag.ItemPageNumber = itemPageNumber;
138-
_tagRepository.Save(tag);
116+
Paging.PageNumber = pageNumber == 0 ? 1 : pageNumber;
139117
}
140118
}
141119

src/Geta.Optimizely.Tags/TagsScheduledJob.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Geta Digital. All rights reserved.
1+
// Copyright (c) Geta Digital. All rights reserved.
22
// Licensed under Apache-2.0. See the LICENSE file in the project root for more information
33

44
using System;
@@ -10,6 +10,8 @@
1010
using EPiServer.PlugIn;
1111
using EPiServer.Scheduler;
1212
using Geta.Optimizely.Tags.Core;
13+
using Geta.Optimizely.Tags.Pages.Geta.Optimizely.Tags.Models;
14+
using X.PagedList;
1315

1416
namespace Geta.Optimizely.Tags
1517
{
@@ -36,6 +38,7 @@ public TagsScheduledJob(
3638
public override string Execute()
3739
{
3840
var tags = _tagService.GetAllTags().ToList();
41+
SetTagPageNumber(tags.ToPagedList());
3942
var contentGuids = GetTaggedContentGuids(tags);
4043

4144
foreach (var contentGuid in contentGuids)
@@ -165,6 +168,18 @@ private void RemoveFromAllTags(Guid guid, IEnumerable<Tag> tags)
165168
}
166169
}
167170

171+
private void SetTagPageNumber(IPagedList<Tag> items)
172+
{
173+
var paging = new Paging();
174+
for (var i = 0; i < items.Count; i++)
175+
{
176+
var itemPageNumber = (i / paging.PageSize) + 1;
177+
var tag = _tagService.GetTagById(items[i].Id);
178+
tag.ItemPageNumber = itemPageNumber;
179+
_tagService.Save(tag);
180+
}
181+
}
182+
168183
public override void Stop()
169184
{
170185
_stop = true;

0 commit comments

Comments
 (0)