Jingga/oms-OnlineResourceWatcher
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-OnlineResourceWatcher.git synced 2026-02-16 16:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test fixes and changes for release

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-12-25 00:06:17 +01:00
parent 4b42ef2f7e
commit 1d42d45d39
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Models/Resource.php
View File

@ -46,7 +46,7 @@ class Resource implements \JsonSerializable
/** /**
* Uri. * Uri.
* *
* @var int * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public string $uri = ''; public string $uri = '';
@ -70,7 +70,7 @@ class Resource implements \JsonSerializable
/** /**
* Xpath. * Xpath.
* *
* @var int * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public string $xpath = ''; public string $xpath = '';
@ -78,7 +78,7 @@ class Resource implements \JsonSerializable
/** /**
* Hash. * Hash.
* *
* @var int * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public string $hash = ''; public string $hash = '';
@ -86,7 +86,7 @@ class Resource implements \JsonSerializable
/** /**
* Last version path. * Last version path.
* *
* @var int * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public string $lastVersionPath = ''; public string $lastVersionPath = '';

10
Theme/Backend/admin-logs.tpl.php
View File

@ -100,13 +100,13 @@ $next = $tableView->getNextLink(
$url = UriFactory::build('{/lang}/{/app}/'{/lang}/{/app}/admin/audit/single?id=' . $audit->getId()); ?> $url = UriFactory::build('{/lang}/{/app}/'{/lang}/{/app}/admin/audit/single?id=' . $audit->getId()); ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td><?= $audit->getId(); ?> <td><?= $audit->getId(); ?>
<td><?php if ($audit->getOld() === null) : echo $this->getHtml('CREATE', '0', '0'); ?> <td><?php if ($audit->old === null) : echo $this->getHtml('CREATE', '0', '0'); ?>
<?php elseif ($audit->getOld() !== null && $audit->getNew() !== null) : echo $this->getHtml('UPDATE', '0', '0'); ?> <?php elseif ($audit->old !== null && $audit->new !== null) : echo $this->getHtml('UPDATE', '0', '0'); ?>
<?php elseif ($audit->getNew() === null) : echo $this->getHtml('DELETE', '0', '0'); ?> <?php elseif ($audit->new === null) : echo $this->getHtml('DELETE', '0', '0'); ?>
<?php else : echo $this->getHtml('UNKNOWN', '0', '0'); ?> <?php else : echo $this->getHtml('UNKNOWN', '0', '0'); ?>
<?php endif; ?> <?php endif; ?>
<td><?= $audit->getType(); ?> <td><?= $audit->type; ?>
<td><?= $audit->getTrigger(); ?> <td><?= $audit->trigger; ?>
<td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/'{/lang}/{/app}/admin/account/settings?id=' . $audit->createdBy->getId()); ?>"><?= $this->printHtml( <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/'{/lang}/{/app}/admin/account/settings?id=' . $audit->createdBy->getId()); ?>"><?= $this->printHtml(
$this->renderUserName('%3$s %2$s %1$s', [$audit->createdBy->name1, $audit->createdBy->name2, $audit->createdBy->name3, $audit->createdBy->login]) $this->renderUserName('%3$s %2$s %1$s', [$audit->createdBy->name1, $audit->createdBy->name2, $audit->createdBy->name3, $audit->createdBy->login])
); ?></a> ); ?></a>

19
tests/Bootstrap.php
View File

@ -257,6 +257,25 @@ $CONFIG = [
'root' => '/', 'root' => '/',
'https' => false, 'https' => false,
], ],
'app' => [
'path' => __DIR__,
'default' => [
'app' => 'Backend',
'id' => 'backend',
'lang' => 'en',
'theme' => 'Backend',
'org' => 1,
],
'domains' => [
'127.0.0.1' => [
'app' => 'Backend',
'id' => 'backend',
'lang' => 'en',
'theme' => 'Backend',
'org' => 1,
],
],
],
'socket' => [ 'socket' => [
'master' => [ 'master' => [
'host' => '127.0.0.1', 'host' => '127.0.0.1',