Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IVYPORTAL-14577: Change Portal version to SNAPSHOT #6

Merged
merged 1 commit into from
Nov 9, 2023
Merged

IVYPORTAL-14577: Change Portal version to SNAPSHOT #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions axonivy-express/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.portal</groupId>
<artifactId>axonivy-express</artifactId>
Expand All @@ -13,7 +14,7 @@
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal</artifactId>
<version>11.2.0-m245</version>
<version>9.1.0.0-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
29 changes: 9 additions & 20 deletions axonivy-express/processes/Functional Processes/executePredefinedWorkflow.p.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
"id" : "U21-g0",
"type" : "EmbeddedStart",
"visual" : {
"at" : { "x" : 288, "y" : 64 },
"size" : { "width" : 26, "height" : 26 }
"at" : { "x" : 288, "y" : 64 }
},
"parentConnector" : "f3",
"connect" : [
Expand All @@ -48,8 +47,7 @@
"id" : "U21-g1",
"type" : "EmbeddedEnd",
"visual" : {
"at" : { "x" : 288, "y" : 1248 },
"size" : { "width" : 26, "height" : 26 }
"at" : { "x" : 288, "y" : 1248 }
},
"parentConnector" : "f6"
}, {
Expand Down Expand Up @@ -707,7 +705,6 @@
"name" : "in 1",
"visual" : {
"at" : { "x" : 264, "y" : 32 },
"size" : { "width" : 26, "height" : 26 },
"labelOffset" : { "x" : 35, "y" : 29 }
},
"parentConnector" : "f30",
Expand All @@ -720,16 +717,14 @@
"name" : "out 1",
"visual" : {
"at" : { "x" : 640, "y" : 416 },
"size" : { "width" : 26, "height" : 26 },
"labelOffset" : { "x" : -6, "y" : 38 }
},
"parentConnector" : "f10"
}, {
"id" : "S11-g2",
"type" : "EmbeddedStart",
"visual" : {
"at" : { "x" : 64, "y" : 320 },
"size" : { "width" : 26, "height" : 26 }
"at" : { "x" : 64, "y" : 320 }
},
"parentConnector" : "f18",
"connect" : [
Expand Down Expand Up @@ -815,8 +810,7 @@
"id" : "S40-g0",
"type" : "EmbeddedStart",
"visual" : {
"at" : { "x" : 64, "y" : 192 },
"size" : { "width" : 26, "height" : 26 }
"at" : { "x" : 64, "y" : 192 }
},
"parentConnector" : "f13",
"connect" : [
Expand All @@ -826,8 +820,7 @@
"id" : "S40-g1",
"type" : "EmbeddedEnd",
"visual" : {
"at" : { "x" : 544, "y" : 192 },
"size" : { "width" : 26, "height" : 26 }
"at" : { "x" : 544, "y" : 192 }
},
"parentConnector" : "f4"
}, {
Expand Down Expand Up @@ -939,9 +932,9 @@
"import java.util.Map;",
"import ch.ivy.addon.portalkit.enums.PortalLibrary;",
"import java.util.Arrays;",
"import ch.ivy.addon.portalkit.service.IvyAdapterService;",
"import com.axonivy.portal.components.service.IvyAdapterService;",
"",
"Map x = IvyAdapterService.startSubProcess(\"handleEndPage()\", null, Arrays.asList(PortalLibrary.AXON_EXPRESS.getValue()));",
"Map x = IvyAdapterService.startSubProcessInApplication(\"handleEndPage()\", null);",
"String callbackUrl = x.get(\"callbackUrl\") as String;",
"ivy.task.customFields().stringField(CustomFields.EXPRESS_END_PAGE_URL.toString()).set(callbackUrl);"
]
Expand Down Expand Up @@ -1000,7 +993,6 @@
"name" : "in 1",
"visual" : {
"at" : { "x" : 64, "y" : 192 },
"size" : { "width" : 26, "height" : 26 },
"labelOffset" : { "x" : 18, "y" : 25 }
},
"parentConnector" : "f8",
Expand All @@ -1013,7 +1005,6 @@
"name" : "out 1",
"visual" : {
"at" : { "x" : 1200, "y" : 192 },
"size" : { "width" : 26, "height" : 26 },
"labelOffset" : { "x" : 21, "y" : 25 }
},
"parentConnector" : "f25"
Expand Down Expand Up @@ -1090,8 +1081,7 @@
"id" : "U20-g0",
"type" : "EmbeddedStart",
"visual" : {
"at" : { "x" : 320, "y" : 64 },
"size" : { "width" : 26, "height" : 26 }
"at" : { "x" : 320, "y" : 64 }
},
"parentConnector" : "f15",
"connect" : [
Expand All @@ -1101,8 +1091,7 @@
"id" : "U20-g1",
"type" : "EmbeddedEnd",
"visual" : {
"at" : { "x" : 320, "y" : 1024 },
"size" : { "width" : 26, "height" : 26 }
"at" : { "x" : 320, "y" : 1024 }
},
"parentConnector" : "f17"
}, {
Expand Down
Loading