From 90565d7ae478411bc4a47757fbcba9321f708e65 Mon Sep 17 00:00:00 2001 From: jdotcms Date: Tue, 21 May 2024 22:15:09 -0600 Subject: [PATCH] #28563 removing template ajax --- .../api/v1/template/TemplateImageForm.java | 21 ++ .../api/v1/template/TemplateResource.java | 7 +- .../portlets/templates/ajax/TemplateAjax.java | 291 ------------------ dotCMS/src/main/webapp/WEB-INF/dwr.xml | 3 - .../htmlpage_assets/template_custom_field.vtl | 37 ++- 5 files changed, 58 insertions(+), 301 deletions(-) create mode 100644 dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateImageForm.java delete mode 100644 dotCMS/src/main/java/com/dotmarketing/portlets/templates/ajax/TemplateAjax.java diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateImageForm.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateImageForm.java new file mode 100644 index 000000000000..5489a3f8bcd4 --- /dev/null +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateImageForm.java @@ -0,0 +1,21 @@ +package com.dotcms.rest.api.v1.template; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.io.Serializable; + +public class TemplateImageForm implements Serializable { + + @JsonProperty("templateId") + private String templateId; + + @JsonCreator + public TemplateImageForm(@JsonProperty("templateId") final String templateId) { + this.templateId = templateId; + } + + public String getTemplateId() { + return templateId; + } +} diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java index 0d94cfa4c60e..0f4b80fd2e17 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/template/TemplateResource.java @@ -816,20 +816,21 @@ public final Response delete(@Context final HttpServletRequest request, * @throws DotSecurityException * @throws DotDataException */ - @GET - @Path("/{templateId}/image") + @POST + @Path("/image") @JSONP @NoCache @Consumes(MediaType.APPLICATION_JSON) @Produces({MediaType.APPLICATION_JSON, "application/javascript"}) public Map fetchTemplateImage(@Context final HttpServletRequest httpRequest, @Context final HttpServletResponse httpResponse, - @PathParam("templateId") final String templateId) throws DotDataException, DotSecurityException { + final TemplateImageForm templateImageForm) throws DotDataException, DotSecurityException { final InitDataObject initData = new WebResource.InitBuilder(webResource) .requestAndResponse(httpRequest, httpResponse).rejectWhenNoUser(true).init(); final User user = initData.getUser(); final PageMode mode = PageMode.get(httpRequest); + final String templateId = templateImageForm.getTemplateId(); Logger.debug(this, ()-> "Getting the image working template by id: " + templateId); final Template template = this.templateAPI.findWorkingTemplate(templateId, user, mode.respectAnonPerms); diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/ajax/TemplateAjax.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/ajax/TemplateAjax.java deleted file mode 100644 index 882258185571..000000000000 --- a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/ajax/TemplateAjax.java +++ /dev/null @@ -1,291 +0,0 @@ -package com.dotmarketing.portlets.templates.ajax; - -import com.dotmarketing.beans.Host; -import com.dotmarketing.beans.Identifier; -import com.dotmarketing.business.APILocator; -import com.dotmarketing.business.DotStateException; -import com.dotmarketing.business.FactoryLocator; -import com.dotmarketing.business.web.UserWebAPI; -import com.dotmarketing.business.web.WebAPILocator; -import com.dotmarketing.exception.DotDataException; -import com.dotmarketing.exception.DotRuntimeException; -import com.dotmarketing.exception.DotSecurityException; -import com.dotmarketing.portlets.contentlet.business.HostAPI; -import com.dotmarketing.portlets.contentlet.model.Contentlet; -import com.dotmarketing.portlets.templates.business.TemplateAPI; -import com.dotmarketing.portlets.templates.factories.TemplateFactory; -import com.dotmarketing.portlets.templates.model.Template; -import com.dotmarketing.portlets.templates.model.TemplateWrapper; -import com.dotmarketing.util.InodeUtils; -import com.dotmarketing.util.Logger; -import com.dotmarketing.util.RegEX; -import com.dotmarketing.util.UtilMethods; -import com.liferay.portal.PortalException; -import com.liferay.portal.SystemException; -import com.liferay.portal.language.LanguageException; -import com.liferay.portal.language.LanguageUtil; -import com.liferay.portal.model.User; -import com.dotcms.repackage.org.directwebremoting.WebContextFactory; - -import javax.servlet.http.HttpServletRequest; -import java.util.*; - -/** - * @author David - */ -public class TemplateAjax { - - UserWebAPI userWebAPI; - TemplateAPI templateAPI; - HostAPI hostAPI; - - public TemplateAjax () { - templateAPI = APILocator.getTemplateAPI(); - userWebAPI = WebAPILocator.getUserWebAPI(); - hostAPI = APILocator.getHostAPI(); - } - - public Map fetchTemplates (Map query, Map queryOptions, int start, int count, - List sort) throws PortalException, SystemException, DotDataException, DotSecurityException { - - HttpServletRequest req = WebContextFactory.get().getHttpServletRequest(); - User user = userWebAPI.getLoggedInUser(req); - boolean respectFrontendRoles = userWebAPI.isLoggedToFrontend(req); - if(count<=0)count=10; - - List