Skip to content

[FIX] Wrong license seats number administration info panel #21222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pierre-lehnen-rc merged 2 commits into from
Mar 20, 2021
Merged

[FIX] Wrong license seats number administration info panel #21222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbf2b24
Use active users to display on limit of users for the license on info…
rodrigok Mar 20, 2021
45e9554
Print more info about issues with licenses on server
rodrigok Mar 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/views/admin/info/LicenseCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const LicenseCard = ({ statistics, isLoading }) => {
? <Skeleton variant='rect' width='x112' height='x112'/>
: <UsagePieGraph
label={t('Users')}
used={statistics?.totalUsers}
used={statistics?.activeUsers}
total={maxActiveUsers}
size={112}
isLoading={isLoading}
Expand Down
3 changes: 3 additions & 0 deletions ee/app/license/server/license.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,22 @@ class LicenseClass {
}
if (!this._validateURL(license.url, this.url)) {
item.valid = false;
console.error(`#### License error: invalid url, licensed to ${ license.url }, used on ${ this.url }`);
this._invalidModules(license.modules);
return item;
}
}

if (license.expiry && this._validateExpiration(license.expiry)) {
item.valid = false;
console.error(`#### License error: expired, valid until ${ license.expiry }`);
this._invalidModules(license.modules);
return item;
}

if (license.maxActiveUsers && !this._hasValidNumberOfActiveUsers(license.maxActiveUsers)) {
item.valid = false;
console.error(`#### License error: over seats, max allowed ${ license.maxActiveUsers }, current active users ${ Users.getActiveLocalUserCount() }`);
this._invalidModules(license.modules);
return item;
}
Expand Down