admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Right in the middle of conversion, not compilable yet

Browse Source
This commit is contained in:
John Cardinal
2021-01-27 00:59:36 +00:00
parent 8ebc877c33
commit 3ffc01f393
23 changed files with 250 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/AyaNova/DataList/ReviewDataList.cs
View File

@@ -1,10 +1,12 @@
using System.Collections.Generic;
using Newtonsoft.Json.Linq;
using AyaNova.Models;
using Microsoft.EntityFrameworkCore;
using System.Linq;
using AyaNova.Biz;
namespace AyaNova.DataList
{
internal class ReviewDataList : AyaDataList, IAyaDataListViewServerCriteria
internal class ReviewDataList : AyaDataList, IAyaDataListServerCriteria
{
public ReviewDataList()
{
@@ -187,17 +189,17 @@ namespace AyaNova.DataList
string IAyaDataListViewServerCriteria.ListViewServerCriteria(User user, AyaNova.Models.AyContext ct)
string IAyaDataListServerCriteria.DataListServerCriteria(long currentUserId, AyaNova.Biz.AuthorizationRoles userRoles, DataListOptions dataListOptions)
{
var CurrentUserRoles = user.Roles;
bool HasSupervisorRole =
CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdminFull) ||
CurrentUserRoles.HasFlag(AuthorizationRoles.DispatchFull) ||
CurrentUserRoles.HasFlag(AuthorizationRoles.InventoryFull) ||
CurrentUserRoles.HasFlag(AuthorizationRoles.SalesFull) ||
CurrentUserRoles.HasFlag(AuthorizationRoles.AccountingFull);
userRoles.HasFlag(AuthorizationRoles.BizAdminFull) ||
userRoles.HasFlag(AuthorizationRoles.DispatchFull) ||
userRoles.HasFlag(AuthorizationRoles.InventoryFull) ||
userRoles.HasFlag(AuthorizationRoles.SalesFull) ||
userRoles.HasFlag(AuthorizationRoles.AccountingFull);
if (!HasSupervisorRole)
return "[{\"fld\":\"metareviewuser\",\"filter\":{\"items\":[{\"op\":\"=\",\"value\":" + user.Id.ToString() + "}]}}]";
return "[{\"fld\":\"metareviewuser\",\"filter\":{\"items\":[{\"op\":\"=\",\"value\":" + currentUserId.ToString() + "}]}}]";
return "[]";//this means effectively don't process this at all
}