Skip to content

Commit

Permalink
update primedlex + get absolute redirect URL
Browse files Browse the repository at this point in the history
  • Loading branch information
ntqdinh-axonivy committed Dec 24, 2024
1 parent 51b1de0 commit 1c77315
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"call" : {
"map" : {
"param.agreementId" : "in.agreementId",
"param.frameParent" : "ivy.html.applicationHomeLink().get()"
"param.frameParent" : "ivy.html.applicationHomeLink().getAbsolute()"
}
},
"output" : {
Expand Down Expand Up @@ -345,7 +345,7 @@
"call" : {
"map" : {
"param.agreementId" : "in.agreementId",
"param.frameParent" : "ivy.html.applicationHomeLink().get()"
"param.frameParent" : "ivy.html.applicationHomeLink().getAbsolute()"
}
},
"output" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ and refence it below in the head part.
<link rel="shortcut icon" href="#{resource['ivy-branding:favicon']}" />
<h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
<h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" />
<h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
<h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
<h:outputStylesheet name="custom.css" library="ivy-branding" />
<!-- Optional Style or Script files:
<h:outputStylesheet name="layouts/styles/style.css" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ private void handleError(SubProcessCallResult callResult) {
* @return
*/
private String getRequestBaseUrl() {
return Ivy.html().applicationHomeLink().get().replace(Ivy.request().getApplication().getContextPath(), "");
return Ivy.html().applicationHomeLink().getAbsolute().replace(Ivy.request().getApplication().getContextPath(), "");
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ and refence it below in the head part.
<link rel="shortcut icon" href="#{resource['ivy-branding:favicon']}" />
<h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
<h:outputStylesheet name="#{ivyFreyaTheme.layout}" library="#{ivyFreyaTheme.library}" />
<h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
<h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
<h:outputStylesheet name="custom.css" library="ivy-branding" />
<!-- Optional Style or Script files:
<h:outputStylesheet name="layouts/styles/style.css" />
Expand Down

0 comments on commit 1c77315

Please sign in to comment.