Merge branch 'feature/Relation_fix' into develop

yasuflatland-lf · Dec 7, 2019 · 2198872 · 2198872
2 parents cc66fe0 + 055dda1
commit 2198872
Show file tree

Hide file tree

Showing 28 changed files with 585 additions and 108 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/yasuflatland-lf/damascus.svg?branch=master)](https://travis-ci.org/yasuflatland-lf/damascus)
 [![Coverage Status](https://coveralls.io/repos/github/yasuflatland-lf/damascus/badge.svg?branch=master)](https://coveralls.io/github/yasuflatland-lf/damascus?branch=master)
 [![Build status](https://ci.appveyor.com/api/projects/status/qqpdw6drt8w07ljp?svg=true)](https://ci.appveyor.com/project/yasuflatland-lf/damascus)
+[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/liferay-damascus/community)
 
 Damascus is a Liferay Blade tool extension for generating scaffoldings of Service builder portlet with CRUD functionality based on a configuration json file, base.json. For more detailed usage, please see [this official document](https://yasuflatland-lf.github.io/damascus-doc/)
 
@@ -14,9 +15,9 @@ The list of what Damascus automatically generate is as follows
 * Workflow
 * Trashbox
 * Search (Including Advanced search for individual fields)
-* Comments
+* Comments (Deprecated in 7.2 templates)
 * Related assets
-* Ratings
+* Ratings (Deprecated in 7.2 templates)
 * Activities (The activities on the portlet will be recorded and visible on an activity portlet)
 * Multiple service builder portlets at once
 * Exporting entities by xls file format
@@ -65,7 +66,7 @@ Please see more detailed settings [here](https://github.com/yasuflatland-lf/dama
 
 ### IDE settings
 Damascus is including lombok library, so annotation library for lombok needs to be properly installed on IDEs. Here are how to apply lombok to Eclipse / IntelliJ
-##### Eclipse
+##### Eclipse (Not Liferay Developer Studio)
 1. Download lombok https://projectlombok.org/download
 2. double click ```lombok.jar``` and select the directory where ```eclipse.exe``` exist
 3. Run ```gradle eclipse``` at the project directory and restart IDE, and right click on the project and display context name, and choose ```gradle > Refresh gradle project```

diff --git a/build.gradle b/build.gradle
@@ -58,7 +58,7 @@ jar {
     manifest {
         attributes(
             "Bundle-SymbolicName": "com.liferay.damascus.cli",
-            "Bundle-Version": "1.1.1",
+            "Bundle-Version": "1.1.2",
             "Bundle-Description": "Liferay extension tool for scaffolding service builder portlet",
             "Main-Class": "com.liferay.damascus.cli.Damascus",
             "JPM-Command": "damascus"

diff --git a/latest/damascus.jar b/latest/damascus.jar
diff --git a/src/main/java/com/liferay/damascus/cli/Damascus.java b/src/main/java/com/liferay/damascus/cli/Damascus.java
@@ -19,7 +19,7 @@
 @Slf4j
 public class Damascus {
 
-    public final static String VERSION = "1.1.1";// + "_" + LocalDateTime.now().toString();
+    public final static String VERSION = "1.1.2";// + "_" + LocalDateTime.now().toString();
 
     /**
      * Main

diff --git a/src/main/resources/templates/7.1/service.xml b/src/main/resources/templates/7.1/service.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 7.1.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_7_1_0.dtd">
 <!--  <dmsc:root templateName="service.xml" pickup="true" />  -->
@@ -174,4 +173,4 @@
     </exceptions>
 
 </service-builder>
-<!--  </dmsc:sync> -->
+<!--  </dmsc:sync> -->
diff --git a/src/main/resources/templates/7.2/Portlet_XXXXWEB_AdminCrudMVCRenderCommand.java.ftl b/src/main/resources/templates/7.2/Portlet_XXXXWEB_AdminCrudMVCRenderCommand.java.ftl
@@ -30,6 +30,7 @@ import ${packageName}.web.upload.${capFirstModel}ItemSelectorHelper;
 		<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
 import ${packageName}.service.${capFirstValidationModel}LocalService;
 import ${packageName}.web.constants.${capFirstValidationModel}WebKeys;
+import ${packageName}.web.util.${capFirstValidationModel}ViewHelper;
 	</#if>
 </#list>
 // </dmsc:sync> //
@@ -115,9 +116,11 @@ public class ${capFirstModel}AdminCrudMVCRenderCommand implements MVCRenderComma
 // <dmsc:sync id="render-attributes" > //
 <#list application.fields as field >
 	<#if field.validation?? && field.validation.className??>
+		<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
 		<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
 		<#assign uppercaseValidationModel = "${field.validation.className?upper_case}">
 
+		request.setAttribute(${capFirstValidationModel}WebKeys.${uppercaseValidationModel}_VIEW_HELPER, _${uncapFirstValidationModel}ViewHelper);
         request.setAttribute(${capFirstModel}WebKeys.${uppercaseValidationModel}_LOCAL_SERVICE, _${uncapFirstValidationModel}LocalService);
 	</#if>
 </#list>
@@ -229,6 +232,9 @@ public class ${capFirstModel}AdminCrudMVCRenderCommand implements MVCRenderComma
 		<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
 		<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
 
+	@Reference
+	private ${capFirstValidationModel}ViewHelper _${uncapFirstValidationModel}ViewHelper;
+
     @Reference
     private ${capFirstValidationModel}LocalService _${uncapFirstValidationModel}LocalService;
 	</#if>
@@ -238,4 +244,4 @@ public class ${capFirstModel}AdminCrudMVCRenderCommand implements MVCRenderComma
 	@Reference
 	private ${capFirstModel}ItemSelectorHelper _${uncapFirstModel}ItemSelectorHelper;
 
-}
+}
diff --git a/src/main/resources/templates/7.2/Portlet_XXXXWEB_CrudMVCRenderCommand.java.ftl b/src/main/resources/templates/7.2/Portlet_XXXXWEB_CrudMVCRenderCommand.java.ftl
@@ -30,6 +30,7 @@ import ${packageName}.web.upload.${capFirstModel}ItemSelectorHelper;
 		<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
 import ${packageName}.service.${capFirstValidationModel}LocalService;
 import ${packageName}.web.constants.${capFirstValidationModel}WebKeys;
+import ${packageName}.web.util.${capFirstValidationModel}ViewHelper;
 	</#if>
 </#list>
 // </dmsc:sync> //
@@ -114,9 +115,11 @@ public class ${capFirstModel}CrudMVCRenderCommand implements MVCRenderCommand {
 // <dmsc:sync id="render-attributes" > //
 <#list application.fields as field >
 	<#if field.validation?? && field.validation.className??>
+		<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
 		<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
 		<#assign uppercaseValidationModel = "${field.validation.className?upper_case}">
 
+		request.setAttribute(${capFirstValidationModel}WebKeys.${uppercaseValidationModel}_VIEW_HELPER, _${uncapFirstValidationModel}ViewHelper);
         request.setAttribute(${capFirstModel}WebKeys.${uppercaseValidationModel}_LOCAL_SERVICE, _${uncapFirstValidationModel}LocalService);
 	</#if>
 </#list>
@@ -230,7 +233,10 @@ public class ${capFirstModel}CrudMVCRenderCommand implements MVCRenderCommand {
 		<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
 		<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
 
-    @Reference
+	@Reference
+	private ${capFirstValidationModel}ViewHelper _${uncapFirstValidationModel}ViewHelper;
+
+	@Reference
     private ${capFirstValidationModel}LocalService _${uncapFirstValidationModel}LocalService;
 	</#if>
 </#list>
@@ -239,4 +245,4 @@ public class ${capFirstModel}CrudMVCRenderCommand implements MVCRenderCommand {
 	@Reference
 	private ${capFirstModel}ItemSelectorHelper _${uncapFirstModel}ItemSelectorHelper;
 
-}
+}
diff --git a/src/main/resources/templates/7.2/Portlet_XXXXWEB_admin_edit.jsp.ftl b/src/main/resources/templates/7.2/Portlet_XXXXWEB_admin_edit.jsp.ftl
@@ -98,10 +98,45 @@ String redirect = ParamUtil.getString(request, "redirect");
 				field.type?string == "com.liferay.damascus.cli.json.fields.Integer"  ||
 				field.type?string == "com.liferay.damascus.cli.json.fields.Text"
 			>
+				<#if field.validation?? && field.validation.className??>
+					<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
+					<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
+					<#assign uppercaseValidationModel = "${field.validation.className?upper_case}">
+
+					<#assign fieldName = "PrimaryKey">
+					<#if field.validation.fieldName??>
+						<#assign fieldName = "${field.validation.fieldName?cap_first}">
+					</#if>
+
+					<#assign orderByField = "PrimaryKey">
+					<#if field.validation.orderByField??>
+						<#assign orderByField = "${field.validation.orderByField?uncap_first}">
+					</#if>
+					<%
+					${capFirstValidationModel}ViewHelper ${uncapFirstValidationModel}ViewHelper = (${capFirstValidationModel}ViewHelper) request
+							.getAttribute(${capFirstValidationModel}WebKeys.${uppercaseValidationModel}_VIEW_HELPER);
+
+					SearchContainerResults<${capFirstValidationModel}> ${uncapFirstValidationModel}Results = ${uncapFirstValidationModel}ViewHelper.getListFromDB(
+							renderRequest, -1, -1, "${orderByField?uncap_first}", "asc", new int[] {WorkflowConstants.STATUS_APPROVED});
+					%>
+					<liferay-ui:error key="${lowercaseModel}-${field.name?lower_case}-not-found"
+									  message="${lowercaseModel}-${field.name?lower_case}-not-found" />
+
+					<aui:select name="${field.name}"
+						label='<%=LanguageUtil.get(request, "${lowercaseModel}-${field.name?lower_case}")
+								+ requiredLabel%>'>
+						<aui:option value=""><%=LanguageUtil.get(request, "please-select") %></aui:option>
+						<% for(${capFirstValidationModel} ${uncapFirstValidationModel} : ${uncapFirstValidationModel}Results.getResults()) { %>
+						<aui:option value="<%= ${uncapFirstValidationModel}.get${fieldName}() %>"><%=${uncapFirstValidationModel}.get${orderByField?cap_first}() %></aui:option>
+						<% } %>
+					</aui:select>
+
+				<#else>
 					<aui:input name="${field.name}" disabled="false"
 						label='<%=LanguageUtil.get(request, "${lowercaseModel}-${field.name?lower_case}")
 						+ requiredLabel%>'
 					/>
+				</#if>
 			</#if>
 			<#-- ---------------- -->
 			<#-- Document Library -->

diff --git a/src/main/resources/templates/7.2/Portlet_XXXXWEB_admin_init.jsp.ftl b/src/main/resources/templates/7.2/Portlet_XXXXWEB_admin_init.jsp.ftl
@@ -55,10 +55,10 @@ page import="com.liferay.trash.util.TrashWebKeys" %>
     <#if field.validation?? && field.validation.className??>
 <%@page import="${packageName}.model.${field.validation.className}"%>
 <%@page import="${packageName}.web.constants.${field.validation.className}WebKeys"%>
+<%@page import="${packageName}.web.util.${field.validation.className}ViewHelper"%>
 <%@page import="${packageName}.service.${field.validation.className}LocalService"%>
     </#if>
 </#list>
-
 <%-- </dmsc:sync> --%>
 
 <liferay-frontend:defineObjects />
@@ -87,4 +87,4 @@ datetimeFormatVal = HtmlUtil.escape(portletPreferences.getValue("datetimeFormat"
 
 datePickerFormatVal = HtmlUtil.escape(portletPreferences.getValue("datePickerFormat", ${uncapFirstModel}Configuration.datePickerFormat()));
 }
-%>
+%>
diff --git a/src/main/resources/templates/7.2/Portlet_XXXXWEB_admin_view.jsp.ftl b/src/main/resources/templates/7.2/Portlet_XXXXWEB_admin_view.jsp.ftl
@@ -12,6 +12,16 @@ String iconUnchecked = "unchecked";
 SimpleDateFormat dateFormat = new SimpleDateFormat(dateFormatVal);
 SimpleDateFormat dateTimeFormat = new SimpleDateFormat(datetimeFormatVal);
 
+<#list application.fields as field >
+	<#if field.validation?? && field.validation.className??>
+		<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
+		<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
+		<#assign uppercaseValidationModel = "${field.validation.className?upper_case}">
+		${capFirstValidationModel}LocalService ${uncapFirstValidationModel}LocalService = (${capFirstValidationModel}LocalService) request
+		.getAttribute(${capFirstModel}WebKeys.${uppercaseValidationModel}_LOCAL_SERVICE);
+	</#if>
+</#list>
+
 ${capFirstModel}DisplayContext ${uncapFirstModel}DisplayContext = (${capFirstModel}DisplayContext)request.getAttribute(${capFirstModel}WebKeys.${uppercaseModel}_DISPLAY_CONTEXT);
 
 String displayStyle = ${uncapFirstModel}DisplayContext.getDisplayStyle();
@@ -104,14 +114,38 @@ ${capFirstModel}ManagementToolbarDisplayContext ${uncapFirstModel}ManagementTool
 					field.type?string == "com.liferay.damascus.cli.json.fields.DocumentLibrary" ||
 					field.type?string == "com.liferay.damascus.cli.json.fields.Integer"
 					>
+
+						<#if field.validation?? && field.validation.className??>
+							<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
+							<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
+
+							<#assign fieldName = "PrimaryKey">
+							<#if field.validation.fieldName??>
+								<#assign fieldName = "${field.validation.fieldName?cap_first}">
+							</#if>
+
+							<#assign orderByField = "PrimaryKey">
+							<#if field.validation.orderByField??>
+								<#assign orderByField = "${field.validation.orderByField?cap_first}">
+							</#if>
+				<%
+				String ${field.name}Text = "";
+				try {
+					${capFirstValidationModel} ${uncapFirstValidationModel} = ${uncapFirstValidationModel}LocalService.get${capFirstValidationModel}(GetterUtil.getLong(${uncapFirstModel}.get${field.name?cap_first}()));
+					${field.name}Text = ${uncapFirstValidationModel}.get${orderByField}();
+				} catch(Exception e) {}
+				%>
+				<liferay-ui:search-container-column-text name="${field.name?cap_first}"
+														 align="center" value="<%= ${field.name}Text %>" />
+						<#else>
 				<liferay-ui:search-container-column-text
 					align="left"
 					name="${field.name?cap_first}"
 					orderable="true"
 					orderableProperty="${field.name}"
 					property="${field.name}"
 				/>
-
+						</#if>
 					</#if>
 				<#-- ---------------- -->
 				<#--     Date         -->
@@ -179,4 +213,4 @@ ${capFirstModel}ManagementToolbarDisplayContext ${uncapFirstModel}ManagementTool
 			submitForm(form, '<portlet:actionURL name="/${lowercaseModel}/crud" />');
 		}
 	}
-</aui:script>
+</aui:script>
diff --git a/src/main/resources/templates/7.2/Portlet_XXXXWEB_edit.jsp.ftl b/src/main/resources/templates/7.2/Portlet_XXXXWEB_edit.jsp.ftl
@@ -100,10 +100,45 @@
 				field.type?string == "com.liferay.damascus.cli.json.fields.Integer"  ||
 				field.type?string == "com.liferay.damascus.cli.json.fields.Text"
 			>
+				<#if field.validation?? && field.validation.className??>
+					<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
+					<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
+					<#assign uppercaseValidationModel = "${field.validation.className?upper_case}">
+
+					<#assign fieldName = "PrimaryKey">
+					<#if field.validation.fieldName??>
+						<#assign fieldName = "${field.validation.fieldName?cap_first}">
+					</#if>
+
+					<#assign orderByField = "PrimaryKey">
+					<#if field.validation.orderByField??>
+						<#assign orderByField = "${field.validation.orderByField?uncap_first}">
+					</#if>
+					<%
+					${capFirstValidationModel}ViewHelper ${uncapFirstValidationModel}ViewHelper = (${capFirstValidationModel}ViewHelper) request
+							.getAttribute(${capFirstValidationModel}WebKeys.${uppercaseValidationModel}_VIEW_HELPER);
+
+					SearchContainerResults<${capFirstValidationModel}> ${uncapFirstValidationModel}Results = ${uncapFirstValidationModel}ViewHelper.getListFromDB(
+							renderRequest, -1, -1, "${orderByField?uncap_first}", "asc", new int[] {WorkflowConstants.STATUS_APPROVED});
+					%>
+					<liferay-ui:error key="${lowercaseModel}-${field.name?lower_case}-not-found"
+									  message="${lowercaseModel}-${field.name?lower_case}-not-found" />
+
+					<aui:select name="${field.name}"
+						label='<%=LanguageUtil.get(request, "${lowercaseModel}-${field.name?lower_case}")
+								+ requiredLabel%>'>
+						<aui:option value=""><%=LanguageUtil.get(request, "please-select") %></aui:option>
+						<% for(${capFirstValidationModel} ${uncapFirstValidationModel} : ${uncapFirstValidationModel}Results.getResults()) { %>
+						<aui:option value="<%= ${uncapFirstValidationModel}.get${fieldName}() %>"><%=${uncapFirstValidationModel}.get${orderByField?cap_first}() %></aui:option>
+						<% } %>
+					</aui:select>
+
+				<#else>
 					<aui:input name="${field.name}" disabled="false"
 						label='<%=LanguageUtil.get(request, "${lowercaseModel}-${field.name?lower_case}")
 						+ requiredLabel%>'
 					/>
+				</#if>
 			</#if>
 			<#-- ---------------- -->
 			<#-- Document Library -->

diff --git a/src/main/resources/templates/7.2/Portlet_XXXXWEB_init.jsp.ftl b/src/main/resources/templates/7.2/Portlet_XXXXWEB_init.jsp.ftl
@@ -54,6 +54,7 @@ page import="com.liferay.trash.util.TrashWebKeys" %>
     <#if field.validation?? && field.validation.className??>
 <%@page import="${packageName}.model.${field.validation.className}"%>
 <%@page import="${packageName}.web.constants.${field.validation.className}WebKeys"%>
+<%@page import="${packageName}.web.util.${field.validation.className}ViewHelper"%>
 <%@page import="${packageName}.service.${field.validation.className}LocalService"%>
     </#if>
 </#list>
@@ -85,4 +86,4 @@ datetimeFormatVal = HtmlUtil.escape(portletPreferences.getValue("datetimeFormat"
 
 datePickerFormatVal = HtmlUtil.escape(portletPreferences.getValue("datePickerFormat", ${uncapFirstModel}Configuration.datePickerFormat()));
 }
-%>
+%>
diff --git a/src/main/resources/templates/7.2/Portlet_XXXXWEB_view.jsp.ftl b/src/main/resources/templates/7.2/Portlet_XXXXWEB_view.jsp.ftl
@@ -12,6 +12,16 @@ String iconUnchecked = "unchecked";
 SimpleDateFormat dateFormat = new SimpleDateFormat(dateFormatVal);
 SimpleDateFormat dateTimeFormat = new SimpleDateFormat(datetimeFormatVal);
 
+<#list application.fields as field >
+	<#if field.validation?? && field.validation.className??>
+		<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
+		<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
+		<#assign uppercaseValidationModel = "${field.validation.className?upper_case}">
+		${capFirstValidationModel}LocalService ${uncapFirstValidationModel}LocalService = (${capFirstValidationModel}LocalService) request
+		.getAttribute(${capFirstModel}WebKeys.${uppercaseValidationModel}_LOCAL_SERVICE);
+	</#if>
+</#list>
+
 ${capFirstModel}DisplayContext ${uncapFirstModel}DisplayContext = (${capFirstModel}DisplayContext)request.getAttribute(${capFirstModel}WebKeys.${uppercaseModel}_DISPLAY_CONTEXT);
 
 String displayStyle = ${uncapFirstModel}DisplayContext.getDisplayStyle();
@@ -86,14 +96,37 @@ ${capFirstModel}ManagementToolbarDisplayContext ${uncapFirstModel}ManagementTool
 					field.type?string == "com.liferay.damascus.cli.json.fields.DocumentLibrary" ||
 					field.type?string == "com.liferay.damascus.cli.json.fields.Integer"
 					>
+						<#if field.validation?? && field.validation.className??>
+							<#assign capFirstValidationModel = "${field.validation.className?cap_first}">
+							<#assign uncapFirstValidationModel = "${field.validation.className?uncap_first}">
+
+							<#assign fieldName = "PrimaryKey">
+							<#if field.validation.fieldName??>
+								<#assign fieldName = "${field.validation.fieldName?cap_first}">
+							</#if>
+
+							<#assign orderByField = "PrimaryKey">
+							<#if field.validation.orderByField??>
+								<#assign orderByField = "${field.validation.orderByField?cap_first}">
+							</#if>
+				<%
+				String ${field.name}Text = "";
+				try {
+					${capFirstValidationModel} ${uncapFirstValidationModel} = ${uncapFirstValidationModel}LocalService.get${capFirstValidationModel}(GetterUtil.getLong(${uncapFirstModel}.get${field.name?cap_first}()));
+					${field.name}Text = ${uncapFirstValidationModel}.get${orderByField}();
+				} catch(Exception e) {}
+				%>
+				<liferay-ui:search-container-column-text name="${field.name?cap_first}"
+														 align="center" value="<%= ${field.name}Text %>" />
+						<#else>
 				<liferay-ui:search-container-column-text
 					align="left"
 					name="${field.name?cap_first}"
 					orderable="true"
 					orderableProperty="${field.name}"
 					property="${field.name}"
 				/>
-
+						</#if>
 					</#if>
 				<#-- ---------------- -->
 				<#--     Date         -->
@@ -160,4 +193,4 @@ ${capFirstModel}ManagementToolbarDisplayContext ${uncapFirstModel}ManagementTool
 			submitForm(form, '<portlet:actionURL name="/${lowercaseModel}/crud" />');
 		}
 	}
-</aui:script>
+</aui:script>