Skip to content

BT 46889: Allows filtering by booking pool in course resources tab #11448

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
matheuszych wants to merge 1 commit into
base: release_11
Choose a base branch
from
Open

BT 46889: Allows filtering by booking pool in course resources tab #11448

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
6 changes: 5 additions & 1 deletion components/ILIAS/BookingManager/BookingService/class.ilBookingGatewayGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,11 @@ public function executeCommand(): void
case "ilbookingreservationsgui":
$this->showPoolSelector("ilbookingreservationsgui");
$this->setSubTabs("reservations");
$res_gui = new ilBookingReservationsGUI($this->pool, $this->help, $this->obj_id);
$res_gui = new ilBookingReservationsGUI(
$this->pool,
$this->help,
ilObject::_lookupType($this->obj_id) !== 'crs' ? $this->obj_id : null
);
$this->ctrl->forwardCommand($res_gui);
break;

Expand Down
11 changes: 4 additions & 7 deletions components/ILIAS/BookingManager/Reservations/class.ilBookingReservationsGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ilBookingReservationsGUI
protected array $raw_post_data;
protected \ILIAS\BookingManager\StandardGUIRequest $book_request;
protected ilBookingHelpAdapter $help;
protected int $context_obj_id;
protected ?int $context_obj_id;
protected ilCtrl $ctrl;
protected ilGlobalTemplateInterface $tpl;
protected ilLanguage $lng;
Expand All @@ -43,11 +43,8 @@ class ilBookingReservationsGUI
protected string $reservation_id; // see BookingReservationDBRepo, obj_user_(slot)_context
protected int $booked_user;

public function __construct(
ilObjBookingPool $pool,
ilBookingHelpAdapter $help,
int $context_obj_id = 0
) {
public function __construct(ilObjBookingPool $pool, ilBookingHelpAdapter $help, ?int $context_obj_id = null)
{
global $DIC;

$this->tpl = $DIC->ui()->mainTemplate();
Expand Down Expand Up @@ -161,7 +158,7 @@ protected function getReservationsTable(?string $reservation_id = null): ilBooki
$show_all,
$filter,
$reservation_id,
$this->context_obj_id > 0 ? [$this->context_obj_id] : null
$this->context_obj_id !== null ? [$this->context_obj_id] : null
);
}

Expand Down
Loading