Skip to content
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

Jump to bottom

XMDS: join action layouts after processing. #2753

Merged
merged 1 commit into from
Oct 2, 2024
Merged

XMDS: join action layouts after processing. #2753

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
8 changes: 4 additions & 4 deletions lib/Xmds/Soap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,11 +619,11 @@
foreach ($layouts as $layoutId) {
// this is recursive function, as we need to get 2nd level nesting and beyond
$this->layoutFactory->getActionPublishedLayoutIds($layoutId, $actionLayoutIds, $processedLayoutIds);
}

// merge the Action layouts to our array, we need the player to download all resources on them
if (!empty($actionLayoutIds)) {
$layouts = array_unique(array_merge($layouts, $actionLayoutIds));
}
// merge the Action layouts to our array, we need the player to download all resources on them
if (!empty($actionLayoutIds)) {
$layouts = array_unique(array_merge($layouts, $actionLayoutIds));
}

// Create a comma separated list to pass into the query which gets file nodes
Expand Down Expand Up @@ -1563,17 +1563,17 @@
$defaultLayout = $this->layoutFactory->getById($defaultLayoutId);

if ($defaultLayout->status >= Status::$STATUS_INVALID) {
$this->getLog()->error(sprintf('Player has invalid default Layout. Display = %s, LayoutId = %d',

Check failure on line 1566 in lib/Xmds/Soap.php

View workflow job for this annotation

GitHub Actions / phpcs 

Opening parenthesis of a multi-line function call must be the last content on the line
$this->display->display,
$defaultLayout->layoutId));

Check failure on line 1568 in lib/Xmds/Soap.php

View workflow job for this annotation

GitHub Actions / phpcs 

Multi-line function call not indented correctly; expected 16 spaces but found 20

Check failure on line 1568 in lib/Xmds/Soap.php

View workflow job for this annotation

GitHub Actions / phpcs 

Closing parenthesis of a multi-line function call must be on a line by itself
}

// Are we interleaving the default? And is the default valid?
if ($this->display->incSchedule == 1 && $defaultLayout->status < Status::$STATUS_INVALID) {
// Add as a node at the end of the schedule.
$layout = $scheduleXml->createElement("layout");

Check failure on line 1574 in lib/Xmds/Soap.php

View workflow job for this annotation

GitHub Actions / phpcs 

String "layout" does not require double quotes; use single quotes instead

$layout->setAttribute("file", $defaultLayoutId);

Check failure on line 1576 in lib/Xmds/Soap.php

View workflow job for this annotation

GitHub Actions / phpcs 

String "file" does not require double quotes; use single quotes instead
$layout->setAttribute("fromdt", '2000-01-01 00:00:00');
$layout->setAttribute("todt", '2030-01-19 00:00:00');
$layout->setAttribute("scheduleid", 0);
Expand Down
Loading