Skip to content

Commit 1fcfc1a

Browse files
committed
Remove quick interactions from list views
1 parent 132de00 commit 1fcfc1a

File tree

2 files changed

+4
-57
lines changed

2 files changed

+4
-57
lines changed

com.woltlab.wcf/templates/shared_listView.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
);
103103
});
104104
</script>
105-
{if $view->hasInteractions() || $view->hasQuickInteractions()}
105+
{if $view->hasInteractions()}
106106
{unsafe:$view->renderInteractionInitialization()}
107107
{/if}
108108
{if $view->hasBulkInteractions()}

wcfsetup/install/files/lib/system/listView/AbstractListView.class.php

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ abstract class AbstractListView
4040
private int $pageNo = 1;
4141
private string|int|null $objectIDFilter = null;
4242
private ?IInteractionProvider $interactionProvider = null;
43-
private ?IInteractionProvider $quickInteractionProvider = null;
4443
private ?IBulkInteractionProvider $bulkInteractionProvider = null;
4544
private InteractionContextMenuComponent $interactionContextMenuComponent;
4645
private ?InteractionContextMenuComponentConfiguration $interactionContextMenuComponentConfiguration = null;
@@ -478,22 +477,6 @@ public function getInteractionProvider(): ?IInteractionProvider
478477
return $this->interactionProvider;
479478
}
480479

481-
/**
482-
* Sets the quick interaction provider that is used to render the interaction directly.
483-
*/
484-
public function setQuickInteractionProvider(IInteractionProvider $provider): void
485-
{
486-
$this->quickInteractionProvider = $provider;
487-
}
488-
489-
/**
490-
* Returns the quick interaction provider of the list view.
491-
*/
492-
public function getQuickInteractionProvider(): ?IInteractionProvider
493-
{
494-
return $this->quickInteractionProvider;
495-
}
496-
497480
/**
498481
* Sets the bulk interaction provider for this list view.
499482
*/
@@ -548,34 +531,16 @@ public function hasInteractions(): bool
548531
&& $this->interactionProvider !== null;
549532
}
550533

551-
/**
552-
* Returns true, if this list view has quick interactions.
553-
*/
554-
public function hasQuickInteractions(): bool
555-
{
556-
return $this->allowInteractions
557-
&& $this->quickInteractionProvider !== null;
558-
}
559-
560534
/**
561535
* Renders the initialization code for the interactions of the list view.
562536
*/
563537
public function renderInteractionInitialization(): string
564538
{
565-
$code = '';
566-
if ($this->interactionProvider !== null) {
567-
$code = $this->getInteractionContextMenuComponent()->renderInitialization($this->getID() . '_items');
568-
}
569-
570-
if ($this->quickInteractionProvider !== null) {
571-
$code .= "\n";
572-
$code .= \implode("\n", \array_map(
573-
fn($interaction) => $interaction->renderInitialization($this->getID() . '_items'),
574-
$this->getQuickInteractionProvider()->getInteractions()
575-
));
539+
if ($this->interactionProvider === null) {
540+
return '';
576541
}
577542

578-
return $code;
543+
return $this->getInteractionContextMenuComponent()->renderInitialization($this->getID() . '_items');
579544
}
580545

581546
/**
@@ -635,24 +600,6 @@ public function renderInteractionContextMenuButton(DatabaseObject $item): string
635600
return $this->getInteractionContextMenuComponent()->renderButton($item);
636601
}
637602

638-
/**
639-
* Renders the interactions for the given object.
640-
*
641-
* @param TDatabaseObject $object
642-
*/
643-
public function renderQuickInteractions(DatabaseObject $object): string
644-
{
645-
$availableInteractions = \array_filter(
646-
$this->getQuickInteractionProvider()->getInteractions(),
647-
static fn($interaction) => $interaction->isAvailable($object)
648-
);
649-
650-
return \implode("\n", \array_map(
651-
static fn($interaction) => $interaction->render($object),
652-
$availableInteractions
653-
));
654-
}
655-
656603
/**
657604
* Filters the list view by the given object id.
658605
*/

0 commit comments

Comments
 (0)