permission changes & minor bug fixes

This commit is contained in:
Dennis Eichhorn 2022-11-09 22:56:19 +01:00
parent 86ab2327c5
commit 1b51ce1cba
57 changed files with 9 additions and 9 deletions

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

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

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

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

0
Admin/Settings/Theme/Backend/settings.tpl.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

View File

@ -6,9 +6,9 @@
{
"key": 1, "listener": "click", "action": [
{"key": 1, "type": "dom.popup", "selector": "#acc-grp-tpl", "aniIn": "fadeIn", "id": "<?= $this->getId(); ?>"},
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1},
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('admin/account?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
]
}

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

@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory;
*/
$accounts = $this->getData('accounts') ?? [];
$previous = empty($accounts) ? '{/prefix}profile/list' : '{/prefix}profile/list?{?}&id=' . \reset($accounts)->getId() . '&ptype=p';
$next = empty($accounts) ? '{/prefix}profile/list' : '{/prefix}profile/list?{?}&id=' . \end($accounts)->getId() . '&ptype=n';
$previous = empty($accounts) ? 'profile/list' : 'profile/list?{?}&id=' . \reset($accounts)->getId() . '&ptype=p';
$next = empty($accounts) ? 'profile/list' : 'profile/list?{?}&id=' . \end($accounts)->getId() . '&ptype=n';
?>
<div class="row">
<div class="col-xs-12">
@ -60,14 +60,14 @@ $next = empty($accounts) ? '{/prefix}profile/list' : '{/prefix}profile/list?
<tbody>
<?php $count = 0;
foreach ($accounts as $key => $account) : ++$count;
$url = UriFactory::build('{/prefix}profile/single?{?}&id=' . $account->getId());
$url = UriFactory::build('profile/single?{?}&id=' . $account->getId());
?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><img alt="<?= $this->getHtml('IMG_alt_user'); ?>" width="30" loading="lazy" class="profile-image"
src="<?=
$account->image instanceof NullMedia
? UriFactory::build('{/prefix}' . $this->getData('defaultImage')->getPath())
: UriFactory::build('{/prefix}' . $account->image->getPath()); ?>"></a>
? UriFactory::build('' . $this->getData('defaultImage')->getPath())
: UriFactory::build('' . $account->image->getPath()); ?>"></a>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($account->account->name3 . ' ' . $account->account->name2 . ' ' . $account->account->name1); ?></a>
<td data-label="<?= $this->getHtml('Activity'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($account->account->getLastActive()->format('Y-m-d')); ?></a>
<?php endforeach; ?>

View File

@ -72,8 +72,8 @@ echo $this->getData('nav')->render();
itemprop="logo" loading="lazy"
src="<?=
$profile->image instanceof NullMedia
? UriFactory::build('{/prefix}' . $this->getData('defaultImage')->getPath())
: UriFactory::build('{/prefix}' . $profile->image->getPath()); ?>"
? UriFactory::build('' . $this->getData('defaultImage')->getPath())
: UriFactory::build('' . $profile->image->getPath()); ?>"
width="100px"></div>
<?php if ($this->request->header->account === $account->getId()) : ?>
<div><a id="iProfileUploadButton" href="#upload" data-action='[

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

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

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

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