LPS-70635 SF - Add missing lang keys

modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-form-web/build.gradle

@@ -11,7 +11,7 @@ dependencies {
 	provided group: "com.liferay", name: "com.liferay.dynamic.data.mapping.data.provider.web", version: "1.0.0"
 	provided group: "com.liferay", name: "com.liferay.dynamic.data.mapping.expression", version: "2.1.0-20170310.013734-10"
 	provided group: "com.liferay", name: "com.liferay.dynamic.data.mapping.form.field.type", version: "2.0.0"
-	provided group: "com.liferay", name: "com.liferay.dynamic.data.mapping.form.renderer", version: "2.2.0-20161227.165132-2"
+	provided group: "com.liferay", name: "com.liferay.dynamic.data.mapping.form.renderer", version: "2.2.0-20170418.232433-27"
 	provided group: "com.liferay", name: "com.liferay.dynamic.data.mapping.form.values.factory", version: "2.0.8-20170125.002431-2"
 	provided group: "com.liferay", name: "com.liferay.dynamic.data.mapping.form.values.query", version: "2.0.0"
 	provided group: "com.liferay", name: "com.liferay.dynamic.data.mapping.io", version: "2.0.13-20170308.203117-3"

modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-form-web/src/main/java/com/liferay/dynamic/data/lists/form/web/internal/converter/DDLFormRuleToDDMFormRuleConverter.java

@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang.math.NumberUtils;
 
@@ -65,15 +67,13 @@ _comparisonExpressionFormat, convertOperand(operands.get(0)),
 				_operatorMap.get(operator), convertOperand(operands.get(1)));
 		}
 
-		String action = String.format(
-			_functionCallUnaryExpressionFormat, functionName,
-			convertOperands(operands));
+		String condition = createCondition(functionName, operands);
 
 		if (operator.startsWith("not")) {
-			return String.format(_notExpressionFormat, action);
+			return String.format(_notExpressionFormat, condition);
 		}
 
-		return action;
+		return condition;
 	}
 
 	protected String convertConditions(
@@ -113,7 +113,11 @@ protected String convertOperand(DDLFormRuleCondition.Operand operand) {
 			return value;
 		}
 
-		return StringUtil.quote(value);
+		String[] values = StringUtil.split(value);
+
+		Stream<String> valueStream = Stream.of(values).map(StringUtil::quote);
+
+		return valueStream.collect(Collectors.joining(StringPool.COMMA));
 	}
 
 	protected String convertOperands(
@@ -147,6 +151,18 @@ protected DDMFormRule convertRule(DDLFormRule ddlFormRule) {
 		return new DDMFormRule(condition, actions);
 	}
 
+	protected String createCondition(
+		String functionName, List<DDLFormRuleCondition.Operand> operands) {
+
+		if (Objects.equals(functionName, "belongsTo")) {
+			operands.remove(0);
+		}
+
+		return String.format(
+			_functionCallUnaryExpressionFormat, functionName,
+			convertOperands(operands));
+	}
+
 	private static final String _comparisonExpressionFormat = "%s %s %s";
 	private static final String _functionCallUnaryExpressionFormat = "%s(%s)";
 	private static final String _notExpressionFormat = "not(%s)";

modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-form-web/src/main/java/com/liferay/dynamic/data/lists/form/web/internal/converter/DDMFormRuleToDDLFormRuleConverter.java

@@ -17,6 +17,7 @@
 import com.liferay.dynamic.data.lists.form.web.internal.converter.model.DDLFormRule;
 import com.liferay.dynamic.data.lists.form.web.internal.converter.model.DDLFormRuleAction;
 import com.liferay.dynamic.data.lists.form.web.internal.converter.model.DDLFormRuleCondition;
+import com.liferay.dynamic.data.lists.form.web.internal.converter.model.DDLFormRuleCondition.Operand;
 import com.liferay.dynamic.data.mapping.expression.DDMExpression;
 import com.liferay.dynamic.data.mapping.expression.DDMExpressionException;
 import com.liferay.dynamic.data.mapping.expression.DDMExpressionFactory;
@@ -30,6 +31,7 @@
 import com.liferay.dynamic.data.mapping.expression.model.OrExpression;
 import com.liferay.dynamic.data.mapping.expression.model.Term;
 import com.liferay.dynamic.data.mapping.model.DDMFormRule;
+import com.liferay.portal.kernel.util.StringPool;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,6 +40,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Stack;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -225,11 +229,8 @@ public Object visit(FunctionCallExpression functionCallExpression) {
 					(DDLFormRuleCondition.Operand)doVisit(parameterExpression));
 			}
 
-			DDLFormRuleCondition ddlFormRuleCondition =
-				new DDLFormRuleCondition(
-					_functionNameOperatorMap.get(functionName), operands);
-
-			_conditions.push(ddlFormRuleCondition);
+			_conditions.push(
+				createDDLFormRuleCondition(functionName, operands));
 
 			return _conditions;
 		}
@@ -260,6 +261,36 @@ public Object visit(Term term) {
 				"constant", term.getValue());
 		}
 
+		protected DDLFormRuleCondition createBelongsToCondition(
+			String belongsToFunctionName, List<Operand> operands) {
+
+			List<Operand> belongsToOperands = new ArrayList<>();
+
+			Stream<String> valueStream = operands.stream().map(
+				operand -> operand.getValue());
+
+			belongsToOperands.add(
+				new Operand(
+					"list",
+					valueStream.collect(Collectors.joining(StringPool.COMMA))));
+
+			return new DDLFormRuleCondition(
+				belongsToFunctionName, belongsToOperands);
+		}
+
+		protected DDLFormRuleCondition createDDLFormRuleCondition(
+			String functionName, List<DDLFormRuleCondition.Operand> operands) {
+
+			String functionNameOperator = _functionNameOperatorMap.get(
+				functionName);
+
+			if (Objects.equals(functionNameOperator, "belongs-to")) {
+				return createBelongsToCondition(functionNameOperator, operands);
+			}
+
+			return new DDLFormRuleCondition(functionNameOperator, operands);
+		}
+
 		protected <T> T doVisit(Expression expression) {
 			return (T)expression.accept(this);
 		}

modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-form-web/src/main/java/com/liferay/dynamic/data/lists/form/web/internal/display/context/DDLFormDisplayContext.java

@@ -107,6 +107,8 @@ public String getDDMFormHTML() throws PortalException {
 		DDMFormRenderingContext ddmFormRenderingContext =
 			createDDMFormRenderingContext(ddmForm);
 
+		ddmFormRenderingContext.setGroupId(recordSet.getGroupId());
+
 		boolean showSubmitButton = isShowSubmitButton();
 
 		ddmFormRenderingContext.setShowSubmitButton(showSubmitButton);

modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-form-web/src/main/resources/META-INF/resources/admin/js/form_builder_render_rule.js

@@ -24,6 +24,10 @@ AUI.add(
 						value: ''
 					},
 
+					getRoles: {
+						value: []
+					},
+
 					logicOperator: {
 						setter: function(val) {
 							return val.toUpperCase();
@@ -47,6 +51,7 @@ AUI.add(
 							calculate: Liferay.Language.get('calculate'),
 							cancel: Liferay.Language.get('cancel'),
 							description: Liferay.Language.get('define-condition-and-action-to-change-fields-and-elements-on-the-form'),
+							do: Liferay.Language.get('do'),
 							enable: Liferay.Language.get('enable'),
 							if: Liferay.Language.get('if'),
 							jumpToPage: Liferay.Language.get('jump-to-page'),
@@ -293,7 +298,7 @@ AUI.add(
 							if (!!conditionKey.match('-condition-second-operand-select') || !!conditionKey.match('-condition-first-operand')) {
 								var fieldName = instance._conditions[conditionKey].getValue();
 
-								if (fieldName) {
+								if (fieldName && fieldName != 'user') {
 									fields.push(instance._getFieldPageIndex(fieldName));
 								}
 							}
@@ -311,7 +316,11 @@ AUI.add(
 							}
 						);
 
-						return field.dataType;
+						if (field) {
+							return field.dataType;
+						}
+
+						return fieldName.toLowerCase();
 					},
 
 					_getFieldPageIndex: function(fieldName) {
@@ -400,10 +409,13 @@ AUI.add(
 
 						var actionTemplateRenderer = SoyTemplateUtil.getTemplateRenderer('ddl.rule.action');
 
+						var strings = instance.get('strings');
+
 						actionListNode.append(
 							actionTemplateRenderer(
 								{
 									deleteIcon: Liferay.Util.getLexiconIconTpl('trash', 'icon-monospaced'),
+									do: strings.do,
 									index: index
 								}
 							)