collect triggers with Callback::set condition

atk4 · Sep 30, 2021 · ee4770c · ee4770c
1 parent fcae73b
commit ee4770c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/View.php b/src/View.php
@@ -625,7 +625,7 @@ protected function getRunningCallbackArgs(bool $isTerminated, array $page): arra
                     $isTerminated = true;
                 }
 
-                if ($isTerminated) {
+                if ($isTerminated && $v->isTriggered() && $v->canTrigger()) {
                     $args[Callback::URL_QUERY_TRIGGER_PREFIX . $v->getUrlTrigger()] = $v->getTriggeredValue();
                 }
             }

diff --git a/tests/CallbackTest.php b/tests/CallbackTest.php
@@ -89,7 +89,7 @@ public function testViewUrlCallback(): void
         $this->simulateCallbackTriggering($cb);
 
         $expectedUrlCbApp = '?' . Callback::URL_QUERY_TRIGGER_PREFIX . 'aa=callback&' . Callback::URL_QUERY_TARGET . '=aa';
-        $expectedUrlCb = '?' . /*Callback::URL_QUERY_TRIGGER_PREFIX . 'aa=1&' .*/ Callback::URL_QUERY_TRIGGER_PREFIX . 'bb=callback&' . Callback::URL_QUERY_TARGET . '=bb';
+        $expectedUrlCb = '?' . Callback::URL_QUERY_TRIGGER_PREFIX . 'aa=1&' . Callback::URL_QUERY_TRIGGER_PREFIX . 'bb=callback&' . Callback::URL_QUERY_TARGET . '=bb';
         $this->assertSame($expectedUrlCbApp, $cbApp->getUrl());
         $this->assertSame($expectedUrlCb, $cb->getUrl());