Remove superfluous trait CaptionDisabled and its uses

Icinga · Dec 6, 2024 · 2a6cf0e · 2a6cf0e
1 parent 9b2ac79
commit 2a6cf0e
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 65 deletions.
diff --git a/library/Icingadb/Common/CaptionDisabled.php b/library/Icingadb/Common/CaptionDisabled.php
diff --git a/library/Icingadb/Common/ListItemCommonLayout.php b/library/Icingadb/Common/ListItemCommonLayout.php
@@ -8,8 +8,6 @@
 
 trait ListItemCommonLayout
 {
-    use CaptionDisabled;
-
     protected function assembleHeader(BaseHtmlElement $header): void
     {
         $header->addHtml($this->createTitle());
@@ -19,8 +17,6 @@ protected function assembleHeader(BaseHtmlElement $header): void
     protected function assembleMain(BaseHtmlElement $main): void
     {
         $main->addHtml($this->createHeader());
-        if (!$this->isCaptionDisabled()) {
-            $main->addHtml($this->createCaption());
-        }
+        $main->addHtml($this->createCaption());
     }
 }
diff --git a/library/Icingadb/Common/ListItemMinimalLayout.php b/library/Icingadb/Common/ListItemMinimalLayout.php
@@ -8,14 +8,10 @@
 
 trait ListItemMinimalLayout
 {
-    use CaptionDisabled;
-
     protected function assembleHeader(BaseHtmlElement $header): void
     {
         $header->add($this->createTitle());
-        if (! $this->isCaptionDisabled()) {
-            $header->add($this->createCaption());
-        }
+        $header->add($this->createCaption());
         $header->add($this->createTimestamp());
     }
 

diff --git a/library/Icingadb/Widget/ItemList/CommentList.php b/library/Icingadb/Widget/ItemList/CommentList.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Icingadb\Common\CaptionDisabled;
 use Icinga\Module\Icingadb\Common\DetailActions;
 use Icinga\Module\Icingadb\Common\Links;
 use Icinga\Module\Icingadb\Common\NoSubjectLink;

diff --git a/library/Icingadb/Widget/ItemList/DowntimeList.php b/library/Icingadb/Widget/ItemList/DowntimeList.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Icingadb\Common\CaptionDisabled;
 use Icinga\Module\Icingadb\Common\DetailActions;
 use Icinga\Module\Icingadb\Common\Links;
 use Icinga\Module\Icingadb\Common\NoSubjectLink;

diff --git a/library/Icingadb/Widget/ItemList/HistoryList.php b/library/Icingadb/Widget/ItemList/HistoryList.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Icingadb\Common\CaptionDisabled;
 use Icinga\Module\Icingadb\Common\DetailActions;
 use Icinga\Module\Icingadb\Common\LoadMore;
 use Icinga\Module\Icingadb\Common\NoSubjectLink;
@@ -16,7 +15,6 @@
 
 class HistoryList extends BaseItemList
 {
-    use CaptionDisabled;
     use NoSubjectLink;
     use ViewMode;
     use LoadMore;

diff --git a/library/Icingadb/Widget/ItemList/HistoryListItemMinimal.php b/library/Icingadb/Widget/ItemList/HistoryListItemMinimal.php
@@ -11,15 +11,6 @@ class HistoryListItemMinimal extends BaseHistoryListItem
 {
     use ListItemMinimalLayout;
 
-    protected function init(): void
-    {
-        parent::init();
-
-        if ($this->list->isCaptionDisabled()) {
-            $this->setCaptionDisabled();
-        }
-    }
-
     protected function getStateBallSize(): string
     {
         return StateBall::SIZE_BIG;

diff --git a/library/Icingadb/Widget/ItemList/NotificationList.php b/library/Icingadb/Widget/ItemList/NotificationList.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Icingadb\Widget\ItemList;
 
-use Icinga\Module\Icingadb\Common\CaptionDisabled;
 use Icinga\Module\Icingadb\Common\DetailActions;
 use Icinga\Module\Icingadb\Common\LoadMore;
 use Icinga\Module\Icingadb\Common\NoSubjectLink;
@@ -15,7 +14,6 @@
 
 class NotificationList extends BaseItemList
 {
-    use CaptionDisabled;
     use NoSubjectLink;
     use ViewMode;
     use LoadMore;

diff --git a/library/Icingadb/Widget/ItemList/NotificationListItemMinimal.php b/library/Icingadb/Widget/ItemList/NotificationListItemMinimal.php
@@ -11,15 +11,6 @@ class NotificationListItemMinimal extends BaseNotificationListItem
 {
     use ListItemMinimalLayout;
 
-    protected function init(): void
-    {
-        parent::init();
-
-        if ($this->list->isCaptionDisabled()) {
-            $this->setCaptionDisabled();
-        }
-    }
-
     protected function getStateBallSize(): string
     {
         return StateBall::SIZE_BIG;