Merge branch '2.x' of https://github.com/GemsTracker/gemstracker-library

 into 2.x

src/Handlers/LogHandler.php

@@ -19,13 +19,19 @@
 use Gems\Snippets\Log\LogSearchSnippet;
 use Gems\Snippets\Log\LogShowSnippet;
 use Gems\Snippets\Log\LogTableSnippet;
+use Gems\SnippetsActions\Browse\BrowseFilteredAction;
 use Gems\SnippetsActions\Browse\BrowseSearchAction;
+use Gems\SnippetsActions\Browse\FastBrowseSearchAction;
+use Gems\SnippetsActions\Export\ExportAction;
+use Gems\SnippetsActions\Form\CreateAction;
+use Gems\SnippetsActions\Form\EditAction;
 use Gems\SnippetsActions\Show\ShowAction;
 use Psr\Cache\CacheItemPoolInterface;
 use Zalt\Base\TranslatorInterface;
 use Zalt\Model\MetaModellerInterface;
 use Zalt\Model\MetaModelLoader;
 use Zalt\SnippetsActions\Browse\BrowseTableAction;
+use Zalt\SnippetsActions\Delete\DeleteAction;
 use Zalt\SnippetsActions\SnippetActionInterface;
 use Zalt\SnippetsLoader\SnippetResponderInterface;
 
@@ -40,6 +46,21 @@
  */
 class LogHandler extends BrowseChangeHandler
 {
+    /**
+     * Defined in Gems\Handlers\BrowseChangeHandler.
+     *
+     * @inheritdoc
+     */
+    public static $actions = [
+        'autofilter' => BrowseFilteredAction::class,
+        'index'      => FastBrowseSearchAction::class, // Override to disable totals
+        'create'     => CreateAction::class,
+        'export'     => ExportAction::class,
+        'edit'       => EditAction::class,
+        'delete'     => DeleteAction::class,
+        'show'       => ShowAction::class,
+    ];
+
     /**
      * The snippets used for the autofilter action.
      *

src/Handlers/Respondent/TokenHandler.php

@@ -268,9 +268,11 @@ public function createModel(bool $detailed, string $action): DataReaderInterface
      */
     public function correctAction()
     {
-        $this->deleteParameters = $this->correctParameters + $this->deleteParameters;
+        $this->deleteParameters = $this->correctParameters + $this->deleteParameters + $this->defaultTokenParameters;
+        $this->deleteSnippets   = $this->getToken()->getCorrectSnippetNames();
+        $this->deleteParameters['requestUndelete'] = false;
 
-        $this->deleteAction();
+        parent::deleteAction();
     }
 
     /**

src/Snippets/Token/TokenNotCompletedSnippet.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Gems\Snippets\Token;
+
+use Zalt\Snippets\MessageableSnippetAbstract;
+
+/**
+ * Token snippet to return when a completed token is required but the selected
+ * token is not completed.
+ */
+class TokenNotCompletedSnippet extends MessageableSnippetAbstract
+{
+    /**
+     * Optional: id of the selected token to show
+     *
+     * Can be derived from $request or $token
+     *
+     * @var string
+     */
+    protected $tokenId;
+
+    /**
+     * Create the snippets content.
+     *
+     * @return mixed Something that can be rendered
+     */
+    public function getHtmlOutput()
+    {
+        $messenger = $this->getMessenger();
+        if ($this->tokenId) {
+            $messenger->addMessage(sprintf($this->_('Token %s not completed.'), $this->tokenId));
+        } else {
+            $messenger->addMessage($this->_('No token specified.'));
+        }
+    }
+}

src/Tracker/Token.php

@@ -824,6 +824,22 @@ public function getDeleteSnippetNames(): array
         }
     }
 
+    /**
+     * Returns an array of snippet names that can be used to delete this token.
+     *
+     * @return array of strings
+     */
+    public function getCorrectSnippetNames(): array
+    {
+        if (!$this->exists) {
+            return ['Token\\TokenNotFoundSnippet'];
+        }
+        if (!$this->isCompleted()) {
+            return ['Token\\TokenNotCompletedSnippet'];
+        }
+        return $this->getTrackEngine()->getTokenDeleteSnippetNames($this);
+    }
+
     /**
      *
      * @return ?int Duration