permission changes & minor bug fixes

This commit is contained in:
Dennis Eichhorn 2022-11-09 22:56:18 +01:00
parent 353447994e
commit 2e6dd6ef3a
59 changed files with 4 additions and 4 deletions

0
Admin/Install/Admin.install.php Normal file → Executable file
View File

0
Admin/Install/Media.install.json Normal file → Executable file
View File

0
Admin/Install/Media.php Normal file → Executable file
View File

0
ICAL.txt Normal file → Executable file
View File

0
Models/SettingsEnum.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.ar.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.cs.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.da.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.de.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.el.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.en.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.es.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.fi.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.fr.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.hu.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.it.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.ja.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.ko.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.no.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.pl.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.pt.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.ru.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.sv.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.th.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.tr.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.uk.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/Navigation.zh.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/ar.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/cs.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/da.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/de.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/el.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/en.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/es.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/fi.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/fr.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/hu.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/it.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/ja.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/ko.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/no.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/pl.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/pt.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/ru.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/sv.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/th.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/tr.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/uk.lang.php Normal file → Executable file
View File

0
Theme/Backend/Lang/zh.lang.php Normal file → Executable file
View File

View File

@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
*/
$contracts = $this->getData('contracts') ?? [];
$previous = empty($contracts) ? '{/prefix}contract/list' : '{/prefix}contract/list?{?}&id=' . \reset($contracts)->getId() . '&ptype=p';
$next = empty($contracts) ? '{/prefix}contract/list' : '{/prefix}contract/list?{?}&id=' . \end($contracts)->getId() . '&ptype=n';
$previous = empty($contracts) ? 'contract/list' : 'contract/list?{?}&id=' . \reset($contracts)->getId() . '&ptype=p';
$next = empty($contracts) ? 'contract/list' : 'contract/list?{?}&id=' . \end($contracts)->getId() . '&ptype=n';
$now = new \DateTime('now');
@ -73,7 +73,7 @@ echo $this->getData('nav')->render(); ?>
</label>
<tbody>
<?php foreach ($contracts as $key => $value) :
$url = UriFactory::build('{/prefix}contract/single?{?}&id=' . $value->getId());
$url = UriFactory::build('contract/single?{?}&id=' . $value->getId());
$type = 'ok';
if (($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 7776000 > $now->getTimestamp())
@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->title); ?></a>
<td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('{/prefix}profile/single?{?}&for=' . $value->account->getId()); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
<td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('profile/single?{?}&for=' . $value->account->getId()); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
<td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $type; ?>"><?= $value->end !== null ? $value->end->format('Y-m-d') : ''; ?></span></a>
<?php endforeach; ?>
</table>

0
tests/Admin/AdminTest.php Normal file → Executable file
View File

0
tests/Controller/ApiControllerTest.php Normal file → Executable file
View File

0
tests/Controller/test.pdf Normal file → Executable file
View File

0
tests/Models/ContractTest.php Normal file → Executable file
View File

0
tests/Models/ContractTypeL11nTest.php Normal file → Executable file
View File

0
tests/Models/ContractTypeTest.php Normal file → Executable file
View File

0
tests/Models/NullContractTest.php Normal file → Executable file
View File

0
tests/Models/NullContractTypeL11nTest.php Normal file → Executable file
View File

0
tests/Models/NullContractTypeTest.php Normal file → Executable file
View File