diff --git a/Admin/Install/Dashboard.install.json b/Admin/Install/Dashboard.install.json old mode 100644 new mode 100755 diff --git a/Admin/Install/Dashboard.php b/Admin/Install/Dashboard.php old mode 100644 new mode 100755 diff --git a/ICAL.txt b/ICAL.txt old mode 100644 new mode 100755 diff --git a/Models/NullTask.php b/Models/NullTask.php index 470f0d2..1b4732d 100755 --- a/Models/NullTask.php +++ b/Models/NullTask.php @@ -36,4 +36,12 @@ final class NullTask extends Task $this->id = $id; parent::__construct(); } + + /** + * {@inheritdoc} + */ + public function jsonSerialize() : mixed + { + return ['id' => $this->id]; + } } diff --git a/Models/TaskSeen.php b/Models/TaskSeen.php old mode 100644 new mode 100755 diff --git a/Models/TaskSeenMapper.php b/Models/TaskSeenMapper.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Components/Tasks/list.tpl.php b/Theme/Backend/Components/Tasks/list.tpl.php index bd5f66b..cf44fe6 100755 --- a/Theme/Backend/Components/Tasks/list.tpl.php +++ b/Theme/Backend/Components/Tasks/list.tpl.php @@ -31,7 +31,7 @@ use phpOMS\Uri\UriFactory; tasks as $key => $task) : ++$c; - $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/prefix}task/single?{?}&id=' . $task->getId())); + $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('task/single?{?}&id=' . $task->getId())); $color = 'darkred'; if ($task->getStatus() === TaskStatus::DONE) { $color = 'green'; } diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/dashboard-task.tpl.php b/Theme/Backend/dashboard-task.tpl.php index fb543e5..d90ec0f 100755 --- a/Theme/Backend/dashboard-task.tpl.php +++ b/Theme/Backend/dashboard-task.tpl.php @@ -34,7 +34,7 @@ $tasksList = $this->getData('tasks') ?? []; foreach ($tasksList as $key => $task) : ++$c; $url = UriFactory::build(!empty($task->redirect) ? $task->redirect - : ('{/prefix}task/single?{?}&id=' . $task->getId()) + : ('task/single?{?}&id=' . $task->getId()) ); ?> @@ -54,7 +54,7 @@ $tasksList = $this->getData('tasks') ?? [];
- getHtml('More', '0', '0'); ?> + getHtml('More', '0', '0'); ?>
\ No newline at end of file diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php index 80dd968..3226277 100755 --- a/Theme/Backend/task-dashboard.tpl.php +++ b/Theme/Backend/task-dashboard.tpl.php @@ -27,8 +27,8 @@ use phpOMS\Uri\UriFactory; /** @var \Modules\Tasks\Models\Task[] $tasks */ $tasks = $this->getData('tasks') ?? []; -$previous = empty($tasks) ? '{/prefix}task/dashboard' : '{/prefix}task/dashboard?{?}&id=' . \reset($tasks)->getId() . '&ptype=p'; -$next = empty($tasks) ? '{/prefix}task/dashboard' : '{/prefix}task/dashboard?{?}&id=' . \end($tasks)->getId() . '&ptype=n'; +$previous = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \reset($tasks)->getId() . '&ptype=p'; +$next = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \end($tasks)->getId() . '&ptype=n'; $open = $this->getData('open'); @@ -54,7 +54,7 @@ if ($open !== null) : $task) : ++$c; - $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/prefix}task/single?{?}&id=' . $task->getId())); + $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('task/single?{?}&id=' . $task->getId())); ?> @@ -80,7 +80,7 @@ if ($open !== null) : - printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?> + printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?> printHtml($task->createdAt->format('Y-m-d H:i')); ?> @@ -115,7 +115,7 @@ if ($open !== null) : } ++$c; - $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/prefix}task/single?{?}&id=' . $task->getId())); + $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('task/single?{?}&id=' . $task->getId())); ?> @@ -141,7 +141,7 @@ if ($open !== null) : - printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?> + printHtml($this->renderUserName('%3$s %2$s %1$s', [$task->createdBy->name1, $task->createdBy->name2, $task->createdBy->name3, $task->createdBy->login ?? ''])); ?> printHtml($task->createdAt->format('Y-m-d H:i')); ?> diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php index cc2acad..699724b 100755 --- a/Theme/Backend/task-single.tpl.php +++ b/Theme/Backend/task-single.tpl.php @@ -84,7 +84,7 @@ echo $this->getData('nav')->render(); ?>
- name; ?> + name; ?>
@@ -176,7 +176,7 @@ echo $this->getData('nav')->render(); ?>
getHtml('status_change'), - '' . $this->printHtml( + '' . $this->printHtml( $this->renderUserName( '%3$s %2$s %1$s', [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login]) @@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); ?>
getHtml('priority_change'), - '' . $this->printHtml( + '' . $this->printHtml( $this->renderUserName( '%3$s %2$s %1$s', [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login]) @@ -254,7 +254,7 @@ echo $this->getData('nav')->render(); ?>
- name; ?> + name; ?>
@@ -300,14 +300,14 @@ echo $this->getData('nav')->render(); ?> ) : ?>
- printHtml( + printHtml( $this->renderUserName( '%3$s %2$s %1$s', [$element->createdBy->name1, $element->createdBy->name2, $element->createdBy->name3, $element->createdBy->login]) ); ?> getHtml('forwarded_to'); ?> - printHtml($to->getRelation()->name1); ?> + printHtml($to->getRelation()->name1); ?> printHtml($to->getRelation()->name); ?> diff --git a/Views/TaskView.php b/Views/TaskView.php index 191edc9..97b4c7e 100755 --- a/Views/TaskView.php +++ b/Views/TaskView.php @@ -74,10 +74,10 @@ class TaskView extends View ->execute(); if (($profile instanceof NullProfile) || $profile->image->getPath() === '') { - return UriFactory::build('{/prefix}' . $this->defaultProfileImage->getPath()); + return UriFactory::build('' . $this->defaultProfileImage->getPath()); } - return UriFactory::build('{/prefix}' . $profile->image->getPath()); + return UriFactory::build('' . $profile->image->getPath()); } /** diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php old mode 100644 new mode 100755 diff --git a/tests/Controller/BackendControllerTest.php b/tests/Controller/BackendControllerTest.php old mode 100644 new mode 100755 diff --git a/tests/Controller/test.md b/tests/Controller/test.md old mode 100644 new mode 100755 diff --git a/tests/Models/NullTaskElementTest.php b/tests/Models/NullTaskElementTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullTaskTest.php b/tests/Models/NullTaskTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/RelationAbstractTest.php b/tests/Models/RelationAbstractTest.php old mode 100644 new mode 100755 diff --git a/tests/Views/TaskViewTest.php b/tests/Views/TaskViewTest.php old mode 100644 new mode 100755