Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Updated the configuration's name and description.
  • Loading branch information
Sina Kashipazha committed Mar 24, 2022
commit 08bb47bfb58dbfa300025a9ac3f2c57aa1055c58
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public interface QueryService {
"allow.user.view.all.domain.accounts", "false",
"Determines whether users can view all user accounts within the same domain", true, ConfigKey.Scope.Domain);

static final ConfigKey<Boolean> SharePublicTemplates = new ConfigKey<>("Advanced", Boolean.class, "share.public.templates", "true",
"If false, templates of this domain with not show up in the list templates.", true, ConfigKey.Scope.Domain);
static final ConfigKey<Boolean> SharePublicTemplatesWithOtherDomains = new ConfigKey<>("Advanced", Boolean.class, "share.public.templates.with.other.domains", "true",
"If false, templates of this domain will not show up in the list templates of other domains.", true, ConfigKey.Scope.Domain);

ListResponse<UserResponse> searchForUsers(ListUsersCmd cmd) throws PermissionDeniedException;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3891,7 +3891,7 @@ private List<TemplateJoinVO> applyPublicTemplateRestriction(List<TemplateJoinVO>
.map(TemplateJoinVO::getDomainId)
.distinct()
.filter(domainId -> domainId != caller.getDomainId())
.filter(Predicate.not(QueryService.SharePublicTemplates::valueIn))
.filter(Predicate.not(QueryService.SharePublicTemplatesWithOtherDomains::valueIn))
.collect(Collectors.toList());

return templates.stream()
Expand Down Expand Up @@ -4381,6 +4381,6 @@ public String getConfigComponentName() {
@Override
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[] {AllowUserViewDestroyedVM, UserVMDeniedDetails, UserVMReadOnlyDetails, SortKeyAscending,
AllowUserViewAllDomainAccounts, SharePublicTemplates};
AllowUserViewAllDomainAccounts, SharePublicTemplatesWithOtherDomains};
}
}