andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.1.8

Browse Source
This commit is contained in:
andy
2021-10-21 18:04:57 +01:00
parent 057b75462e
commit ea61d37840
32 changed files with 1486 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebAdmin/Admin/Controllers/OrganisationController.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
// Paging.
Model_Organisation model = new Model_Organisation(Localiser);
model.Paging.PageNo = 1;
model.Paging.PageLength = 6;
model.Paging.PageLength = 8;
// Default status.
if (sta.StartsWithCI("Awa"))
SaxoniteCoreWebAdmin/Admin/Controllers/UserController-Ajax.cs
+4 -2
View File
@@ -109,8 +109,10 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
// Item filter.
SaxUserAccount.Params prmUserAccount = new SaxUserAccount.Params();
prmUserAccount.UserAccountFilter = model.Filter.User;
prmUserAccount.StatusCat = SaxUserAccount.StatusCat.NotDeleted;
prmUserAccount.UserFilterPartial = model.Filter.User;
prmUserAccount.SportIdsIncluded.AddId(model.Filter.UserSportId.ToSysId());
prmUserAccount.RegionIdsIncluded.AddId(model.Filter.UserRegionId.ToSysId());
prmUserAccount.StatusCat = model.Filter.UserStatusCategoryCode != null ? model.FilterUserStatusCategory : SaxUserAccount.StatusCat.NotDeleted;
model.Paging.ItemTotal = (ulong)AccountMgr.GetUserAccountCount(prmUserAccount);
model.PopulatePagingTo(prmUserAccount.ResultsPaging);
SaxoniteCoreWebAdmin/Admin/Controllers/UserController.cs
+7 -1
View File
@@ -1,8 +1,10 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Sarand.Net.Standard.Base.Utils;
using Saxonite.Net.Core.Web.Admin.Models;
using Saxonite.Net.Core.Web.Base.App;
using Saxonite.Net.Core.Web.Base.Controllers;
using Saxonite.Net.Standard.Base.Bus;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -23,7 +25,7 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
//-------------------------------------------------------------------
[HttpGet]
public IActionResult Index()
public IActionResult Index(String sta)
{
// Validate session.
if (!ValidUserSession)
@@ -34,6 +36,10 @@ namespace Saxonite.Net.Core.Web.Admin.Controllers
model.Paging.PageNo = 1;
model.Paging.PageLength = 12;
// Default status.
if (sta.StartsWithCI("Awa"))
model.Filter.UserStatusCategoryCode = nameof(SaxUserAccount.StatusCat.AwaitingOnly);
return View(model);
}