Uh oh!
There was an error while loading. Please reload this page.
Allow subscription to indicate that a userlimit is reached - #23278
Merged
Conversation
rullzer
requested changes
Oct 8, 2020
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
MorrisJobkeforce-pushed
the
enh/noid/user-limits
branch
2 times, most recently
from
December 2, 2020 08:45
24d9915 to
21da73aCompareMorrisJobke
marked this pull request as ready for review
December 2, 2020 08:45
MorrisJobke
commented
Dec 2, 2020
Uh oh!
There was an error while loading. Please reload this page.
MorrisJobke
commented
Dec 2, 2020
MemberAuthor
/backport to stable20 |
MorrisJobkeforce-pushed
the
enh/noid/user-limits
branch
from
December 2, 2020 09:31
0f4bace to
e0e032fCompareSigned-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
MorrisJobkeforce-pushed
the
enh/noid/user-limits
branch
from
December 2, 2020 14:20
e0e032f to
c0a05c0CompareMorrisJobke
commented
Dec 2, 2020
MemberAuthor
Ready for review 🚀 |
rullzer
approved these changes
Dec 2, 2020
rullzer
left a comment
Member
There was a problem hiding this comment.
Looks good! Didn't test in depth but a quick smoke test showed it OK. And the test seems sane!
blizzz
reviewed
Dec 2, 2020
Comment on lines
301
to
+307
| public function createUser($uid, $password) { | ||
| // DI injection is not used here as IRegistry needs the user manager itself for user count and thus it would create a cyclic dependency | ||
| if (\OC::$server->get(IRegistry::class)->delegateIsHardUserLimitReached()) { | ||
| $l = \OC::$server->getL10N('lib'); | ||
| throw new HintException($l->t('The user limit has been reached and the user was not created.')); | ||
| } | ||
Member
There was a problem hiding this comment.
heads up, this will not catch users provisioned by other backends
jospoortvliet
left a comment
Member
There was a problem hiding this comment.
Looks good, just these changes would be nice 👍
| if ($notification->getSubject() === 'user_limit_reached') { | ||
| $notification->setParsedSubject($l->t('The user limit of this instance is reached.')); | ||
| $notification->setParsedMessage($l->t('Add a subscription key to increase the user limit of this instance. For more information have a look at the Enterprise subscription page.')); |
Member
There was a problem hiding this comment.
Suggested change
| $notification->setParsedMessage($l->t('Add a subscription key to increase the user limit of this instance. For more information have a look at the Enterprise subscription page.')); | |
| $notification->setParsedMessage($l->t('Enter your subscription key to increase the user limit. For more information about Nextcloud Enterprise see our website.')); |
| if ($notification->getSubject() === 'user_limit_reached') { | ||
| $notification->setParsedSubject($l->t('The user limit of this instance is reached.')); | ||
| $notification->setParsedMessage($l->t('Add a subscription key to increase the user limit of this instance. For more information have a look at the Enterprise subscription page.')); | ||
| $notification->setLink('https://nextcloud.com/enterprise/order/'); |
Member
There was a problem hiding this comment.
Suggested change
| $notification->setLink('https://nextcloud.com/enterprise/order/'); | |
| $notification->setLink('https://nextcloud.com/enterprise/'); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.