Skip to content

[FIX] #21693 changed the tab-context while removing calendar #11851

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
alitvinleifos wants to merge 2 commits into
base: release_10
Choose a base branch
from
+21 −8
Open

[FIX] #21693 changed the tab-context while removing calendar #11851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00ffecd
fix bug 21693 ILIAS changes the tab-context while removing calendar u…
alitvinleifos Aug 4, 2026
d4e78a1
adjust the removal inside of calendar for the consistent tab-context
alitvinleifos Aug 11, 2026
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
21 changes: 16 additions & 5 deletions components/ILIAS/Calendar/classes/class.ilCalendarCategoryGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,17 @@ protected function initSelectedCategoryIdsFromPost(): array
return [];
}

protected function initSelectedCategoryIdFromGet(): int
{
if ($this->http->wrapper()->query()->has('selected_cat_id')) {
return $this->http->wrapper()->query()->retrieve(
'selected_cat_id',
$this->refinery->kindlyTo()->int()
);
}
return 0;
}

public function executeCommand(): void
{
$next_class = $this->ctrl->getNextClass($this);
Expand Down Expand Up @@ -334,15 +345,15 @@ protected function update(): void
protected function confirmDelete(): void
{
$cat_ids = $this->initSelectedCategoryIdsFromPost();
if (
!count($cat_ids) &&
$this->initCategoryIdFromQuery() > 0
) {
$cat_ids = [$this->initCategoryIdFromQuery()];
$selected_cat_id = $this->initSelectedCategoryIdFromGet();

if (!count($cat_ids) && $selected_cat_id > 0) {
$cat_ids = [$selected_cat_id];
}
if (!count($cat_ids)) {
$this->tpl->setOnScreenMessage('failure', $this->lng->txt('select_one'), true);
$this->manage();
return;
}
$confirmation_gui = new ilConfirmationGUI();
$confirmation_gui->setFormAction($this->ctrl->getFormAction($this));
Expand Down
6 changes: 4 additions & 2 deletions components/ILIAS/Calendar/classes/class.ilCalendarManageTableGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,14 @@ protected function fillRow(array $a_set): void
$url
);
}
$this->ctrl->clearParameterByClass($this->getParentObject()::class, 'category_id');

// delete
if ($this->actions->checkDeleteCal($a_set['id'])) {
$this->ctrl->setParameter($this->getParentObject(), 'selected_cat_id', $a_set['id']);
$url = $this->ctrl->getLinkTarget($this->getParentObject(), 'confirmDelete');
$this->ctrl->clearParameterByClass($this->getParentObject()::class, 'selected_cat_id');

$dropDownItems[] = $this->ui_factory->button()->shy(
$this->lng->txt('delete'),
$url
Expand All @@ -142,8 +146,6 @@ protected function fillRow(array $a_set): void
$this->tpl->parseCurrentBlock();
}

$this->ctrl->setParameter($this->getParentObject(), 'category_id', '');

switch ($a_set['type']) {
case ilCalendarCategory::TYPE_GLOBAL:
$this->tpl->setVariable('IMG_SRC', ilUtil::getImagePath('standard/icon_calg.svg'));
Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/Calendar/classes/class.ilCalendarPresentationGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ protected function prepareOutput(): void

// delete action
if ($this->actions->checkDeleteCal($this->category_id)) {
$ctrl->setParameterByClass("ilcalendarcategorygui", "category_id", $this->category_id);
$ctrl->setParameterByClass("ilcalendarcategorygui", "selected_cat_id", $this->category_id);
$dropDownItems[] = $this->ui_factory->button()->shy(
$this->lng->txt("cal_delete_cal"),
$ctrl->getLinkTargetByClass("ilcalendarcategorygui", "confirmDelete")
Expand Down
Loading