From 9c4fc9f20b13bc51273415fdff1e7103105be348 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 28 Sep 2017 08:47:51 -0400 Subject: [PATCH 1/2] HOR-3905 WebEntry2: Fix the combination "Single-Anonymous" with "Redirect to custom URL" was working as Webentry1, it was fixed and goes through the Webentry2 flow. --- workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php index c30f08621..0231946b2 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php @@ -1080,7 +1080,9 @@ class WebEntry public function isWebEntryOne($weUid) { $webEntry = \WebEntryPeer::retrieveByPK($weUid); - return $webEntry->getWeType()==='SINGLE' && $webEntry->getWeAuthentication()==='ANONYMOUS'; + return $webEntry->getWeType() === 'SINGLE' + && $webEntry->getWeAuthentication() === 'ANONYMOUS' + && $webEntry->getWeCallback() === 'PROCESSMAKER'; } /** From 1ab89b34b0f516693a3dd85e6fd2661e3017e4cc Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 28 Sep 2017 09:07:57 -0400 Subject: [PATCH 2/2] HOR-3905 Fix CR. --- workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php index 0231946b2..df51d4540 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php @@ -2,6 +2,7 @@ namespace ProcessMaker\BusinessModel; use ProcessMaker\Core\System; +use WebEntryPeer; class WebEntry { @@ -1079,7 +1080,7 @@ class WebEntry */ public function isWebEntryOne($weUid) { - $webEntry = \WebEntryPeer::retrieveByPK($weUid); + $webEntry = WebEntryPeer::retrieveByPK($weUid); return $webEntry->getWeType() === 'SINGLE' && $webEntry->getWeAuthentication() === 'ANONYMOUS' && $webEntry->getWeCallback() === 'PROCESSMAKER';