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

Browse Source
This commit is contained in:
John Cardinal
2023-01-10 17:12:49 +00:00
parent bd0aee913b
commit 0be04ca13b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/DataList/LicenseDataList.cs
View File

@@ -14,7 +14,7 @@ namespace Sockeye.DataList
var RoleSet = BizRoles.GetRoleSet(DefaultListAType); var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
DefaultColumns = new List<string>() { "licensecreated", "LicenseTrialMode", "licenseactive", "licenseregto", "licensecustomer", "LicenseFetchedOn", "notificationsent", "ProductGroup" }; DefaultColumns = new List<string>() { "licensecreated", "LicenseTrialMode", "licenseactive", "licenseregto", "LicenseFetchedOn", "notificationsent", "ProductGroup" };
DefaultSortBy = new Dictionary<string, string>() { { "licensecreated", "-" } }; DefaultSortBy = new Dictionary<string, string>() { { "licensecreated", "-" } };
FieldDefinitions = new List<DataListFieldDefinition>(); FieldDefinitions = new List<DataListFieldDefinition>();

7
server/biz/GlobalBizSettingsBiz.cs
View File

@@ -556,7 +556,7 @@ namespace Sockeye.Biz
//l.Users=jKey["AyaNovaLicenseKey"]["TotalScheduleableUsers"].Value<int>(); //l.Users=jKey["AyaNovaLicenseKey"]["TotalScheduleableUsers"].Value<int>();
l.PGroup = ProductGroup.AyaNova7; l.PGroup = ProductGroup.AyaNova7;
l.FetchCode = jLicense["code"].Value<string>(); l.FetchCode = jLicense["code"].Value<string>();
l.Tags.Add("v7");
} }
else if (KeyText.Contains("AyaNovaLiteLicenseKey")) else if (KeyText.Contains("AyaNovaLiteLicenseKey"))
{ {
@@ -579,7 +579,7 @@ namespace Sockeye.Biz
l.PGroup = ProductGroup.AyaNova7; l.PGroup = ProductGroup.AyaNova7;
l.FetchCode = jLicense["code"].Value<string>(); l.FetchCode = jLicense["code"].Value<string>();
l.Tags.Add("v7");
l.Tags.Add("lite"); l.Tags.Add("lite");
} }
else else
@@ -614,7 +614,6 @@ namespace Sockeye.Biz
else else
l.PGroup = ProductGroup.RavenSubscription; l.PGroup = ProductGroup.RavenSubscription;
l.MaintenanceExpire = jKey["Key"]["MaintenanceExpiration"].Value<DateTime>().ToUniversalTime(); l.MaintenanceExpire = jKey["Key"]["MaintenanceExpiration"].Value<DateTime>().ToUniversalTime();
l.Tags.Add("raven");
} }
l.Created = (DateTime)DateUtil.EpochToDateNullIsNull(jLicense["dtcreated"].Value<long>()); l.Created = (DateTime)DateUtil.EpochToDateNullIsNull(jLicense["dtcreated"].Value<long>());
@@ -702,8 +701,6 @@ namespace Sockeye.Biz
else else
l.PGroup = ProductGroup.RavenSubscription; l.PGroup = ProductGroup.RavenSubscription;
l.MaintenanceExpire = jKey["Key"]["MaintenanceExpiration"].Value<DateTime>().ToUniversalTime(); l.MaintenanceExpire = jKey["Key"]["MaintenanceExpiration"].Value<DateTime>().ToUniversalTime();
l.Tags.Add("raven");
l.Tags.Add("trial");
l.Created = DateUtil.EpochToDateNullIsMin(jTrialRequestItem["dtProcessed"].Value<long>()); l.Created = DateUtil.EpochToDateNullIsMin(jTrialRequestItem["dtProcessed"].Value<long>());
l.FetchedOn = DateUtil.EpochToDateNullIsNull(jTrialRequestItem["dtFetched"].Value<long?>()); l.FetchedOn = DateUtil.EpochToDateNullIsNull(jTrialRequestItem["dtFetched"].Value<long?>());
l.FetchEmail = jTrialRequestItem["email"].Value<string>(); l.FetchEmail = jTrialRequestItem["email"].Value<string>();