Skip to content

Commit

Permalink
Merge branch 'next' into test-pr-checks
Browse files Browse the repository at this point in the history
  • Loading branch information
nolanpro committed Dec 20, 2023
2 parents 65977f1 + cb4fb82 commit 6415c45
Show file tree
Hide file tree
Showing 33 changed files with 401 additions and 104 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.1",
"version": "2.79.2",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
Expand Down
17 changes: 0 additions & 17 deletions src/components/task.vue
Original file line number Diff line number Diff line change
Expand Up @@ -578,23 +578,6 @@ export default {
this.nodeId = this.initialNodeId;
this.requestData = this.value;
this.loopContext = this.initialLoopContext;
if (
this.$parent.task &&
!this.$parent.task.screen &&
this.$parent.task.allow_interstitial &&
this.$parent.task.interstitial_screen
) {
// 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
Loading

0 comments on commit 6415c45

Please sign in to comment.