Skip to content

Commit daafd54

Browse files
committed
Move 'view page' interaction into the dropdown menu
1 parent 1731b87 commit daafd54

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

wcfsetup/install/files/lib/system/gridView/admin/PageGridView.class.php

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
use wcf\system\gridView\renderer\DefaultColumnRenderer;
2424
use wcf\system\gridView\renderer\ObjectIdColumnRenderer;
2525
use wcf\system\gridView\renderer\TimeColumnRenderer;
26-
use wcf\system\interaction\AbstractInteraction;
2726
use wcf\system\interaction\admin\PageInteractions;
2827
use wcf\system\interaction\Divider;
2928
use wcf\system\interaction\EditInteraction;
@@ -137,30 +136,6 @@ public function applyFilter(DatabaseObjectList $list, string $id, string $value)
137136
new EditInteraction(PageEditForm::class)
138137
]);
139138
$this->setInteractionProvider($provider);
140-
141-
$this->addQuickInteraction(
142-
new class('view') extends AbstractInteraction {
143-
#[\Override]
144-
public function render(DatabaseObject $object): string
145-
{
146-
\assert($object instanceof Page);
147-
148-
return \sprintf(
149-
'<a href="%s" class="jsTooltip" title="%s"><fa-icon name="magnifying-glass"></a>',
150-
StringUtil::encodeHTML($object->getLink()),
151-
WCF::getLanguage()->get('wcf.acp.page.button.viewPage')
152-
);
153-
}
154-
155-
#[\Override]
156-
public function isAvailable(DatabaseObject $object): bool
157-
{
158-
\assert($object instanceof Page);
159-
160-
return !$object->requireObjectID;
161-
}
162-
}
163-
);
164139
$this->addQuickInteraction(
165140
new ToggleInteraction(
166141
'enable',

wcfsetup/install/files/lib/system/interaction/admin/PageInteractions.class.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use wcf\system\event\EventHandler;
88
use wcf\system\interaction\AbstractInteractionProvider;
99
use wcf\system\interaction\DeleteInteraction;
10+
use wcf\system\interaction\LinkableObjectInteraction;
1011

1112
/**
1213
* Interaction provider for pages.
@@ -21,6 +22,11 @@ final class PageInteractions extends AbstractInteractionProvider
2122
public function __construct()
2223
{
2324
$this->addInteractions([
25+
new LinkableObjectInteraction(
26+
'view',
27+
'wcf.acp.page.button.viewPage',
28+
static fn(Page $page) => !$page->requireObjectID
29+
),
2430
new DeleteInteraction('core/pages/%s', static fn(Page $page) => $page->canDelete()),
2531
]);
2632

0 commit comments

Comments
 (0)