diff --git a/changelog.md b/changelog.md index 27f0c3ec..bd31f246 100644 --- a/changelog.md +++ b/changelog.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. - Feature: check if service-builder and rest-builder maven plugins match the used liferay version - Feature: check if portal-web dependency matches the used liferay version - Bugfix: fix encoding when executing Poshi Scripts (UTF-8 instead of system dependant encoding) +- Bugfix: Missing implicit variables workflowContext, roles and user in scripted-assignment tag for workflow definitions - Change: Update support for IntelliJ 2023.3, dropped support for older versions ## 0.0.17 diff --git a/src/main/java/de/dm/intellij/liferay/workflow/LiferayWorkflowContextVariablesUtil.java b/src/main/java/de/dm/intellij/liferay/workflow/LiferayWorkflowContextVariablesUtil.java index 06c0dbb5..b5235c05 100644 --- a/src/main/java/de/dm/intellij/liferay/workflow/LiferayWorkflowContextVariablesUtil.java +++ b/src/main/java/de/dm/intellij/liferay/workflow/LiferayWorkflowContextVariablesUtil.java @@ -130,7 +130,7 @@ public class LiferayWorkflowContextVariablesUtil { new AbstractMap.SimpleEntry<>("user", "com.liferay.portal.kernel.model.User") )); - WORKFLOW_SCRIPT_OUTPUT_VARIABLES.put("scripted-receipient", Arrays.asList( + WORKFLOW_SCRIPT_OUTPUT_VARIABLES.put("scripted-recipient", Arrays.asList( new AbstractMap.SimpleEntry<>("workflowContext", "java.util.Map"), new AbstractMap.SimpleEntry<>("roles", "java.util.List"), new AbstractMap.SimpleEntry<>("user", "com.liferay.portal.kernel.model.User") diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 73c02e50..35fc3067 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -35,6 +35,7 @@
  • Feature: check if service-builder and rest-builder maven plugins match the used liferay version
  • Feature: check if portal-web dependency matches the used liferay version
  • Bugfix: fix encoding when executing Poshi Scripts (UTF-8 instead of system dependant encoding)
  • +
  • Bugfix: Missing implicit variables workflowContext, roles and user in scripted-assignment tag for workflow definitions
  • Change: Update support for IntelliJ 2023.3, dropped support for older versions
  • diff --git a/src/test/java/de/dm/intellij/liferay/language/groovy/GroovyWorkflowDefinitionScriptTagImplicitMembersContributorTest.java b/src/test/java/de/dm/intellij/liferay/language/groovy/GroovyWorkflowDefinitionScriptTagImplicitMembersContributorTest.java index 16facacd..aa815722 100644 --- a/src/test/java/de/dm/intellij/liferay/language/groovy/GroovyWorkflowDefinitionScriptTagImplicitMembersContributorTest.java +++ b/src/test/java/de/dm/intellij/liferay/language/groovy/GroovyWorkflowDefinitionScriptTagImplicitMembersContributorTest.java @@ -33,7 +33,7 @@ public void testGroovyInputImplicitVariables() { assertTrue(strings.contains("taskName")); } - public void testGroovyOutputImplicitVariables() { + public void testGroovyOutputImplicitVariablesScriptedAssignment() { myFixture.configureByFiles("workflow-definition-scripted-assignment-groovy.xml"); myFixture.complete(CompletionType.BASIC, 1); List strings = myFixture.getLookupElementStrings(); @@ -42,4 +42,13 @@ public void testGroovyOutputImplicitVariables() { assertTrue("Workflow groovy script for should offer output variable \"roles\"", strings.contains("roles")); } + public void testGroovyOutputImplicitVariablesScriptedRecipient() { + myFixture.configureByFiles("workflow-definition-scripted-recipient-groovy.xml"); + myFixture.complete(CompletionType.BASIC, 1); + List strings = myFixture.getLookupElementStrings(); + + assertNotNull(strings); + assertTrue("Workflow groovy script for should offer output variable \"roles\"", strings.contains("roles")); + } + } diff --git a/testdata/de/dm/intellij/liferay/language/groovy/GroovyWorkflowDefinitionScriptTagImplicitMembersContributorTest/workflow-definition-scripted-recipient-groovy.xml b/testdata/de/dm/intellij/liferay/language/groovy/GroovyWorkflowDefinitionScriptTagImplicitMembersContributorTest/workflow-definition-scripted-recipient-groovy.xml new file mode 100644 index 00000000..5e0ee56d --- /dev/null +++ b/testdata/de/dm/intellij/liferay/language/groovy/GroovyWorkflowDefinitionScriptTagImplicitMembersContributorTest/workflow-definition-scripted-recipient-groovy.xml @@ -0,0 +1,43 @@ + + + + Sample Workflow + 1 + + created + true + + + approved + approved + true + + + + + review + + + notify + + freemarker + email + + + + groovy + + + onEntry + + + +