Skip to content

UI: a few tweaks to fix roundtrip modals as prompt content #11105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schmitz-ilias wants to merge 1 commit into
base: trunk
Choose a base branch
from
+12 −4
Open

UI: a few tweaks to fix roundtrip modals as prompt content #11105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/ILIAS/UI/src/Implementation/Component/Modal/RoundTrip.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,14 +267,14 @@ public function withDedicatedName(string $dedicated_name): self
*/
public function getPromptButtons(): array
{
return $this->buttons;
return $this->action_buttons;
}

/**
* @inheritdoc
*/
public function getPromptTitle(): string
{
return $this->type;
return $this->title;
}
}
12 changes: 10 additions & 2 deletions components/ILIAS/UI/src/Implementation/Component/Prompt/State/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,19 @@ protected function renderState(State $component, RendererInterface $default_rend
return $tpl->get();
}

$tpl->setVariable('CONTENT', $default_renderer->render($content_component));
$content = $content_component;
if ($content_component instanceof \ILIAS\UI\Component\Modal\RoundTrip) {
$content = $content_component->getContent();
}

$tpl->setVariable('CONTENT', $default_renderer->render($content));
$tpl->setVariable('TITLE', $component->getTitle());

$buttons = $component->getButtons();
if ($content_component instanceof \ILIAS\UI\Component\Input\Container\Form\Form) {
if (
$content_component instanceof \ILIAS\UI\Component\Input\Container\Form\Form &&
!($content_component instanceof \ILIAS\UI\Component\Modal\RoundTrip)
) {
$submit_button = $this->getUIFactory()->button()->standard(
$content_component->getSubmitLabel() ?? $this->txt("save"),
$content_component->getSubmitSignal()
Expand Down
Loading