Skip to content
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.

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

backport: Search correctly entities with user role (#766) #768

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public Clusters list() {
private Clusters listVirtOnly() {
if (isFiltered()) {
return mapVirtOnlyCollection(getBackendCollection(QueryType.GetAllClusters,
new QueryParametersBase()));
new QueryParametersBase(), SearchType.Cluster));
} else {
return mapVirtOnlyCollection(getBackendCollection(SearchType.Cluster));
}
Expand All @@ -59,7 +59,7 @@ private Clusters listVirtOnly() {
private Clusters listAll() {
if (isFiltered()) {
return mapCollection(getBackendCollection(QueryType.GetAllClusters,
new QueryParametersBase()));
new QueryParametersBase(), SearchType.Cluster));
} else {
return mapCollection(getBackendCollection(SearchType.Cluster));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public BackendDataCentersResource() {
public DataCenters list() {
if (isFiltered()) {
return mapCollection(getBackendCollection(QueryType.GetAllStoragePools,
new QueryParametersBase()));
new QueryParametersBase(), SearchType.StoragePool));
} else {
return mapCollection(getBackendCollection(SearchType.StoragePool));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.ovirt.engine.api.resource.VnicProfilesResource;
import org.ovirt.engine.api.restapi.util.LinkHelper;
import org.ovirt.engine.core.common.businessentities.network.Network;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.QueryParametersBase;
import org.ovirt.engine.core.common.queries.QueryType;
Expand All @@ -23,7 +24,7 @@ public VnicProfiles list() {

@Override
protected List<org.ovirt.engine.core.common.businessentities.network.VnicProfile> getVnicProfilesCollection() {
return getBackendCollection(QueryType.GetAllVnicProfiles, new QueryParametersBase());
return getBackendCollection(QueryType.GetAllVnicProfiles, new QueryParametersBase(), SearchType.VnicProfile);
}

public Response add(VnicProfile vnicProfile) {
Expand Down