From 767f884a8593d88d9c4581d095379a2faac48819 Mon Sep 17 00:00:00 2001
From: AntonLH <anton.larrahi@gmail.com>
Date: Wed, 21 Apr 2021 12:10:34 +0200
Subject: [PATCH 1/2] Fix ModelConfiguration null validation on Advanced Search
 on 7.3 template

---
 .../templates/7.3/Portlet_XXXXWEB_ViewHelper.java.ftl         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/7.3/Portlet_XXXXWEB_ViewHelper.java.ftl b/src/main/resources/templates/7.3/Portlet_XXXXWEB_ViewHelper.java.ftl
index d5deee2..2b5109c 100644
--- a/src/main/resources/templates/7.3/Portlet_XXXXWEB_ViewHelper.java.ftl
+++ b/src/main/resources/templates/7.3/Portlet_XXXXWEB_ViewHelper.java.ftl
@@ -366,8 +366,8 @@ public class ${capFirstModel}ViewHelper {
 		SimpleDateFormat dateFormat = new SimpleDateFormat(
 			HtmlUtil.escape(
                 portletPreferences.getValue(
-                    "dateFormat", ${uncapFirstModel}Configuration.dateFormat())));
-			
+                    "dateFormat", Validator.isNull(${uncapFirstModel}Configuration) ? "yyyy/MM/dd" : ${uncapFirstModel}Configuration.dateFormat())));
+
     	Map<String, Object> advSearchKeywordsObj = new HashMap<>();
     	
     	try {

From 44ba129ae4922b3b248feb18c9cfe7f87042f002 Mon Sep 17 00:00:00 2001
From: AntonLH <anton.larrahi@gmail.com>
Date: Thu, 22 Apr 2021 10:32:10 +0200
Subject: [PATCH 2/2] Use Liferays own Language.properties

---
 .../templates/7.3/Portlet_XXXXWEB_Language.properties.ftl    | 5 -----
 .../templates/7.3/Portlet_XXXXWEB_admin_edit_actions.jsp.ftl | 4 ++--
 .../templates/7.3/Portlet_XXXXWEB_edit_actions.jsp.ftl       | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/templates/7.3/Portlet_XXXXWEB_Language.properties.ftl b/src/main/resources/templates/7.3/Portlet_XXXXWEB_Language.properties.ftl
index 165b544..cf46ecd 100644
--- a/src/main/resources/templates/7.3/Portlet_XXXXWEB_Language.properties.ftl
+++ b/src/main/resources/templates/7.3/Portlet_XXXXWEB_Language.properties.ftl
@@ -25,9 +25,4 @@ ${application.model?lower_case}-updated-successfully=The data has been updated.
 ${application.model?lower_case}-deleted-successfully=The data has been deleted.
 </#list>
 there-was-an-unexpected-error.-please-refresh-the-current-page=Unexpected error. Please refresh.
-permissions=Permissions
-view=View
-edit=Update
-remove=Delete
-trash=Move to trash
 # </dmsc:sync> #
\ No newline at end of file
diff --git a/src/main/resources/templates/7.3/Portlet_XXXXWEB_admin_edit_actions.jsp.ftl b/src/main/resources/templates/7.3/Portlet_XXXXWEB_admin_edit_actions.jsp.ftl
index 4ae946b..ce16ae8 100644
--- a/src/main/resources/templates/7.3/Portlet_XXXXWEB_admin_edit_actions.jsp.ftl
+++ b/src/main/resources/templates/7.3/Portlet_XXXXWEB_admin_edit_actions.jsp.ftl
@@ -80,7 +80,7 @@ String primKey = String.valueOf(${uncapFirstModel}.getPrimaryKey());
 			<portlet:param name="resourcePrimKey" value="<%= primKey %>" />
 		</portlet:actionURL>
 
-		<liferay-ui:icon iconCssClass="icon-remove" label="<%= true %>" markupView="lexicon" message="remove" url="<%= delete${capFirstModel}URL.toString() %>" />
+		<liferay-ui:icon iconCssClass="icon-remove" label="<%= true %>" markupView="lexicon" message="delete" url="<%= delete${capFirstModel}URL.toString() %>" />
 	</c:if>
 
 	<c:if test="<%= ${capFirstModel}EntryPermission.contains(permissionChecker, ${uncapFirstModel}, ActionKeys.DELETE) %>">
@@ -94,6 +94,6 @@ String primKey = String.valueOf(${uncapFirstModel}.getPrimaryKey());
 			<portlet:param name="resourcePrimKey" value="<%= primKey %>" />
 		</portlet:actionURL>
 
-		<liferay-ui:icon iconCssClass="icon-trash" label="<%= true %>" markupView="lexicon" message="trash" url="<%= moveToTrash${capFirstModel}URL.toString() %>" />
+		<liferay-ui:icon iconCssClass="icon-trash" label="<%= true %>" markupView="lexicon" message="move-to-recycle-bin" url="<%= moveToTrash${capFirstModel}URL.toString() %>" />
 	</c:if>
 </liferay-ui:icon-menu>
\ No newline at end of file
diff --git a/src/main/resources/templates/7.3/Portlet_XXXXWEB_edit_actions.jsp.ftl b/src/main/resources/templates/7.3/Portlet_XXXXWEB_edit_actions.jsp.ftl
index 97bb94d..1c2b7a7 100644
--- a/src/main/resources/templates/7.3/Portlet_XXXXWEB_edit_actions.jsp.ftl
+++ b/src/main/resources/templates/7.3/Portlet_XXXXWEB_edit_actions.jsp.ftl
@@ -80,7 +80,7 @@ String primKey = String.valueOf(${uncapFirstModel}.getPrimaryKey());
 			<portlet:param name="resourcePrimKey" value="<%= primKey %>" />
 		</portlet:actionURL>
 
-		<liferay-ui:icon iconCssClass="icon-remove" label="<%= true %>" markupView="lexicon" message="remove" url="<%= delete${capFirstModel}URL.toString() %>" />
+		<liferay-ui:icon iconCssClass="icon-remove" label="<%= true %>" markupView="lexicon" message="delete" url="<%= delete${capFirstModel}URL.toString() %>" />
 	</c:if>
 
 	<c:if test="<%= ${capFirstModel}EntryPermission.contains(permissionChecker, ${uncapFirstModel}, ActionKeys.DELETE) %>">
@@ -94,6 +94,6 @@ String primKey = String.valueOf(${uncapFirstModel}.getPrimaryKey());
 			<portlet:param name="resourcePrimKey" value="<%= primKey %>" />
 		</portlet:actionURL>
 
-		<liferay-ui:icon iconCssClass="icon-trash" label="<%= true %>" markupView="lexicon" message="trash" url="<%= moveToTrash${capFirstModel}URL.toString() %>" />
+		<liferay-ui:icon iconCssClass="icon-trash" label="<%= true %>" markupView="lexicon" message="move-to-recycle-bin" url="<%= moveToTrash${capFirstModel}URL.toString() %>" />
 	</c:if>
 </liferay-ui:icon-menu>
\ No newline at end of file