Skip to content

Commit

Permalink
Merge branch 'next' into epic/FOUR-11574
Browse files Browse the repository at this point in the history
  • Loading branch information
nolanpro committed Dec 5, 2023
2 parents 9b267b2 + 5221d9f commit 26f24fd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@processmaker/screen-builder",
"version": "2.79.0",
"version": "2.79.1",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
Expand Down
8 changes: 8 additions & 0 deletions src/components/task.vue
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,14 @@ export default {
// if interstitial screen exists, show it
this.screen = this.$parent.task.interstitial_screen;
}
if (
this.$parent.task &&
this.$parent.task.interstitial_screen &&
this.$parent.task.process_request.status === 'ACTIVE'
) {
this.screen = this.$parent.task.interstitial_screen;
}
},
destroyed() {
this.unsubscribeSocketListeners();
Expand Down

0 comments on commit 26f24fd

Please sign in to comment.