Skip to content

Commit d586cee

Browse files
committed
Version 2.4
1 parent c3d7548 commit d586cee

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

src/Core/Api/AssetsController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public AssetsController(IDataService data, IStorageService store)
3434
[HttpGet]
3535
public async Task<AssetsModel> Get(int page = 1, string filter = "", string search = "")
3636
{
37-
var pager = new Pager(page);
37+
var blog = await _data.CustomFields.GetBlogSettings();
38+
var pager = new Pager(page, blog.ItemsPerPage);
3839
IEnumerable<AssetItem> items;
3940

4041
if (string.IsNullOrEmpty(search))

src/Core/Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
<Version>2.3.1.8</Version>
5+
<Version>2.4.0.0</Version>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/Upgrade/Program.cs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static void ReplaceFile(string file)
7070
{
7171
if (File.Exists(oldFile))
7272
File.Delete(oldFile);
73-
73+
7474
File.Copy(newFile, oldFile);
7575
_items.Add($"Replacing file: {oldFile} with {newFile}");
7676
}
@@ -100,28 +100,24 @@ static void ReplaceFolder(string folder)
100100

101101
static List<string> GetCoreFiles()
102102
{
103-
var fileName = $"{_upgDir}{_slash}files.txt";
104-
var files = new List<string>();
105-
106-
var lines = File.ReadAllLines(fileName);
107-
for (var i = 0; i < lines.Length; i++)
108-
{
109-
files.Add(lines[i].Trim());
110-
}
111-
return files;
103+
return ReadFile($"{_upgDir}{_slash}files.txt");
112104
}
113105

114106
static List<string> GetCoreFolders()
115107
{
116-
var fileName = $"{_upgDir}{_slash}folders.txt";
117-
var folders = new List<string>();
108+
return ReadFile($"{_upgDir}{_slash}folders.txt");
109+
}
118110

111+
static List<string> ReadFile(string fileName)
112+
{
113+
var items = new List<string>();
119114
var lines = File.ReadAllLines(fileName);
115+
120116
for (var i = 0; i < lines.Length; i++)
121117
{
122-
folders.Add(lines[i].Trim().Replace("|", _slash));
118+
items.Add(lines[i].Trim().Replace("|", _slash));
123119
}
124-
return folders;
120+
return items;
125121
}
126122
}
127123
}

0 commit comments

Comments
 (0)