Skip to content

pass domainid for list ldap users #26

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

Closed
wants to merge 2 commits into from
Closed

pass domainid for list ldap users #26

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
3e3ca9c
pass domainid for list users
DaanHoogland Nov 16, 2018
7b63e99
blind attempt at passing arg
Nov 19, 2018
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
7 changes: 6 additions & 1 deletion ...authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

import javax.inject.Inject;

import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.log4j.Logger;

import org.apache.cloudstack.api.APICommand;
Expand Down Expand Up @@ -56,6 +58,9 @@ public class LdapListUsersCmd extends BaseListCmd {
description = "Determines whether all ldap users are returned or just non-cloudstack users")
private String listType;

@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = false, entityType = DomainResponse.class, description = "linked domain")
private Long domainId;

public LdapListUsersCmd() {
super();
}
Expand Down Expand Up @@ -83,7 +88,7 @@ public void execute() throws ServerApiException {
List<LdapUserResponse> ldapResponses = null;
final ListResponse<LdapUserResponse> response = new ListResponse<LdapUserResponse>();
try {
final List<LdapUser> users = _ldapManager.getUsers(null);
final List<LdapUser> users = _ldapManager.getUsers(domainId);
ldapResponses = createLdapUserResponse(users);
} catch (final NoLdapUserMatchingQueryException ex) {
ldapResponses = new ArrayList<LdapUserResponse>();
Expand Down
2 changes: 1 addition & 1 deletion ui/scripts/ui-custom/accountsWizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
}
});
$.ajax({
url: createURL("listLdapUsers&listtype=new"),
url: createURL("listLdapUsers&listtype=new&domainid=" + args.currentData.domainid),
dataType: "json",
async: false,
success: function(json) {
Expand Down