Skip to content

fix CI error in 28.0-release #10489

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
kongtiaowang wants to merge 7 commits into
base: 28.0-release
Choose a base branch
from
+25 −12
Open

fix CI error in 28.0-release #10489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
577b06d
fix filter
kongtiaowang May 12, 2026
2396faa
fix filter
kongtiaowang May 12, 2026
dbbb329
test
kongtiaowang May 12, 2026
2963c25
cs fix
kongtiaowang May 12, 2026
0b4670e
phan error
kongtiaowang May 12, 2026
0f3fab6
cs
kongtiaowang May 12, 2026
560e337
cs
kongtiaowang May 12, 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
2 changes: 1 addition & 1 deletion modules/login/jsx/loginIndex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class Login extends Component {
// test URL as string
if (typeof redirectUrl !== 'string') {
window.location.href = window.location.origin;
};
}

// parse URL
try {
Expand Down
3 changes: 2 additions & 1 deletion modules/media/ajax/FileUpload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ function editFile()
}

if (!$user->hasPermission('media_write')
|| (!$user->hasPermission('access_all_profiles') && !$user->hasCenter(new \CenterID(strval($row['CenterID']))))
|| (!$user->hasPermission('access_all_profiles')
&& !$user->hasCenter(new \CenterID(strval($row['CenterID']))))
) {
showMediaError("Permission Denied", 403);
exit(0);
Expand Down
19 changes: 13 additions & 6 deletions modules/media/php/files.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,17 @@ class Files extends \LORIS\Http\FilesPassthroughEndpoint
/**
* {@inheritDoc}
*
* @param \Psr\Http\Message\ServerRequestInterface $request The PSR15 Request being handled
* @param \Psr\Http\Message\ServerRequestInterface $request The PSR15
* Request being handled
*
* @return \Psr\Http\Message\ResponseInterface
*/
#[\Override]
public function handle(\Psr\Http\Message\ServerRequestInterface $request) : \Psr\Http\Message\ResponseInterface
{
public function handle(
\Psr\Http\Message\ServerRequestInterface $request
) : \Psr\Http\Message\ResponseInterface {
$user = \User::singleton();
// @phan-suppress-next-line PhanUndeclaredMethod
if (!$this->isAccessibleBy($user)) {
return new \LORIS\Http\Response\JSON\Forbidden("Permission Denied");
}
Expand All @@ -42,7 +45,7 @@ class Files extends \LORIS\Http\FilesPassthroughEndpoint
$idx = strpos($url, $prefix);
$file = substr($url, $idx + strlen($prefix));

$db = $this->loris->getDatabaseConnection();
$db = $this->loris->getDatabaseConnection();
$row = $db->pselectRow(
"SELECT s.CenterID FROM media m
JOIN session s ON m.session_id = s.ID
Expand All @@ -54,8 +57,12 @@ class Files extends \LORIS\Http\FilesPassthroughEndpoint
return new \LORIS\Http\Response\JSON\NotFound("File not found");
}

if (!$user->hasPermission('access_all_profiles') && !$user->hasCenter(new \CenterID(strval($row['CenterID'])))) {
return new \LORIS\Http\Response\JSON\Forbidden("Permission Denied for this site");
if (!$user->hasPermission('access_all_profiles')
&& !$user->hasCenter(new \CenterID(strval($row['CenterID'])))
) {
return new \LORIS\Http\Response\JSON\Forbidden(
"Permission Denied for this site"
);
}

return parent::handle($request);
Expand Down
4 changes: 3 additions & 1 deletion modules/media/php/media.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ class Media extends \DataFrameworkMenu
}

if (!$user->hasPermission('access_all_profiles')) {
$provisioner = $provisioner->filter(new \LORIS\Data\Filters\UserSiteMatch());
$provisioner = $provisioner->filter(
new \LORIS\Data\Filters\UserSiteMatch()
);
}

return $provisioner->filter(new HideFileFilter());
Expand Down
4 changes: 2 additions & 2 deletions php/libraries/Module.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ abstract class Module extends \LORIS\Router\PrefixRouter
public function getHelp(string $page): string
{
$helpFile = realpath($this->dir . "/help/$page.md");
if ($helpFile && file_exists($helpFile) &&
str_starts_with($helpFile, realpath($this->dir))
if ($helpFile && file_exists($helpFile)
&& str_starts_with($helpFile, realpath($this->dir))
) {
return file_get_contents($helpFile);
}
Expand Down
5 changes: 4 additions & 1 deletion test/integrationtests/LorisIntegrationTest.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,12 @@ abstract class LorisIntegrationTest extends TestCase
);
$el_dropdown->selectByVisibleText($test_value);
}

$bodyText = $this->safeFindElement(
WebDriverBy::cssSelector("$row")
WebDriverBy::cssSelector("$row"),
15
)->getText();

// 4 means there are 4 records under this site.
$this->assertStringContainsString($expect_records, $bodyText);
//test clear filter
Expand Down
Loading