apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge error: use new method of getting scoped vars (#10751)

Browse Source
This commit is contained in:
dahn 2025-04-18 11:20:26 +02:00 committed by GitHub
parent 3c75d9363b
commit aa4718a301
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/com/cloud/user/AccountManagerImpl.java
View File

@ -1297,7 +1297,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
// Check permissions // Check permissions
checkAccess(getCurrentCallingAccount(), domain); checkAccess(getCurrentCallingAccount(), domain);
if (!userAllowMultipleAccounts.valueInDomain(domainId) && !_userAccountDao.validateUsernameInDomain(userName, domainId)) { if (!userAllowMultipleAccounts.valueInScope(ConfigKey.Scope.Domain, domainId) && !_userAccountDao.validateUsernameInDomain(userName, domainId)) {
throw new InvalidParameterValueException(String.format("The user %s already exists in domain %s", userName, domain)); throw new InvalidParameterValueException(String.format("The user %s already exists in domain %s", userName, domain));
} }
@ -1485,7 +1485,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
throw new PermissionDeniedException(String.format("Account: %s is a system account, can't add a user to it", account)); throw new PermissionDeniedException(String.format("Account: %s is a system account, can't add a user to it", account));
} }
if (!userAllowMultipleAccounts.valueInDomain(domainId) && !_userAccountDao.validateUsernameInDomain(userName, domainId)) { if (!userAllowMultipleAccounts.valueInScope(ConfigKey.Scope.Domain, domainId) && !_userAccountDao.validateUsernameInDomain(userName, domainId)) {
throw new CloudRuntimeException("The user " + userName + " already exists in domain " + domainId); throw new CloudRuntimeException("The user " + userName + " already exists in domain " + domainId);
} }
List<UserVO> duplicatedUsers = _userDao.findUsersByName(userName); List<UserVO> duplicatedUsers = _userDao.findUsersByName(userName);
@ -1636,7 +1636,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
} }
// duplicate usernames cannot exist in same domain unless explicitly configured // duplicate usernames cannot exist in same domain unless explicitly configured
if (!userAllowMultipleAccounts.valueInDomain(newAccount.getDomainId())) { if (!userAllowMultipleAccounts.valueInScope(ConfigKey.Scope.Domain, newAccount.getDomainId())) {
assertUserNotAlreadyInDomain(existingUser, newAccount); assertUserNotAlreadyInDomain(existingUser, newAccount);
} }