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

Browse Source
This commit is contained in:
John Cardinal
2022-09-22 22:04:03 +00:00
parent bcad11d6db
commit a51635f13a
12 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/AyaNova/Controllers/GlobalBizSettingsController.cs
View File

@@ -109,6 +109,14 @@ namespace AyaNova.Api.Controllers
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
}
bool IsSubscriptionBuild = false;
#if (SUBSCRIPTION_BUILD)
IsSubscriptionBuild=true;
#else
IsSubscriptionBuild = false;//yes redundant, but defensive all the same
#endif
var ret = new
{
//Actual global settings:
@@ -129,7 +137,8 @@ namespace AyaNova.Api.Controllers
LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,
ServerDbId = AyaNova.Core.License.ServerDbId,
Company = AyaNova.Core.License.ActiveKey.RegisteredTo
Company = AyaNova.Core.License.ActiveKey.RegisteredTo,
SBuild = IsSubscriptionBuild
// ,
// TestTSDaysWMS=new TimeSpan(22,10,15,22,33),

12
server/AyaNova/Controllers/NotifyController.cs
View File

@@ -53,12 +53,18 @@ namespace AyaNova.Api.Controllers
bool suIsDefault = await UserBiz.SuperIsDefaultCredsAsync(ct);
//confirm if there are logo's to show as well
var logo = await ct.Logo.AsNoTracking().SingleOrDefaultAsync();
if (logo == null)
bool HasLargeLogo = false;
bool HasMediumLogo = false;
bool HasSmallLogo = false;
if (logo != null)
{
return Ok(ApiOkResponse.Response(new { eval = showSampleLogins, sudf = suIsDefault, ll = false, ml = false, sl = false, lcr = AyaNova.Core.License.LicenseConsentRequired }));
if (logo.Small != null) HasSmallLogo = true;
if (logo.Medium != null) HasMediumLogo = true;
if (logo.Large != null) HasLargeLogo = true;
}
return Ok(ApiOkResponse.Response(
new { eval = showSampleLogins, sudf = suIsDefault, ll = logo.Large != null ? true : false, ml = logo.Medium != null ? true : false, sl = logo.Small != null ? true : false, lcr = AyaNova.Core.License.LicenseConsentRequired }));
new { eval = showSampleLogins, sudf = suIsDefault, ll = HasLargeLogo, ml = HasMediumLogo, sl = HasSmallLogo, lcr = AyaNova.Core.License.LicenseConsentRequired }));
}