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.

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

fix(core): Adding support for listing templates across multiple sites #31086

Merged
merged 8 commits into from
Jan 14, 2025
Merged

fix(core): Adding support for listing templates across multiple sites #31086

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0871205
#30660 Adding support for listing templates across sites
nollymar Jan 8, 2025
47b975f
#30660 Testing support for listing templates using wildcard host
nollymar Jan 8, 2025
dfb4c10
#30660 Removing unused imports
nollymar Jan 8, 2025
bf1fdac
#30660 Listing templates across multiple sites
nollymar Jan 8, 2025
e852c77
chore: add label
rjvelazco Jan 9, 2025
d276861
Merge branch 'main' into issue-30660-unable-to-use-templates-across-m…
rjvelazco Jan 9, 2025
8adc51d
fix: make the all site option clickable and fetch all templates after…
rjvelazco Jan 14, 2025
f91c2c4
Merge branch 'issue-30660-unable-to-use-templates-across-multiple-sit…
rjvelazco Jan 14, 2025
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
19 changes: 15 additions & 4 deletions dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,26 @@ public final Response list(@Context final HttpServletRequest httpRequest,
final InitDataObject initData = new WebResource.InitBuilder(webResource)
.requestAndResponse(httpRequest, httpResponse).rejectWhenNoUser(true).init();
final User user = initData.getUser();
final Lazy<String> lazyCurrentHost = Lazy.of(() -> Try.of(() -> Host.class.cast(httpRequest.getSession().getAttribute(WebKeys.CURRENT_HOST)).getIdentifier()).getOrNull());
final Optional<String> checkedHostId = Optional.ofNullable(Try.of(()-> APILocator.getHostAPI()
.find(hostId, user, false).getIdentifier()).getOrElse(lazyCurrentHost.get()));


Logger.debug(this, ()-> "Getting the List of templates");

final Map<String, Object> extraParams = new HashMap<>();
extraParams.put(ARCHIVE_PARAM, archive);
checkedHostId.ifPresent(checkedHostIdentifier -> extraParams.put(ContainerPaginator.HOST_PARAMETER_ID, checkedHostIdentifier));

//In case we need to get the list of templates across multiple sites, we don't set the TemplatePaginator.HOST_PARAMETER_ID
if (null == hostId || !StringPool.STAR.equals(hostId)) {
final Lazy<String> lazyCurrentHost = Lazy.of(() -> Try.of(() -> Host.class.cast(
httpRequest.getSession().getAttribute(WebKeys.CURRENT_HOST)).getIdentifier())
.getOrNull());
final Optional<String> checkedHostId = Optional.ofNullable(
Try.of(() -> APILocator.getHostAPI()
.find(hostId, user, false).getIdentifier())
.getOrElse(lazyCurrentHost.get()));
checkedHostId.ifPresent(
checkedHostIdentifier -> extraParams.put(TemplatePaginator.HOST_PARAMETER_ID,
checkedHostIdentifier));
}
return this.paginationUtil.getPage(httpRequest, user, filter, page, perPage, orderBy, OrderDirection.valueOf(direction),
extraParams);
}
Expand Down
Loading