From 60899ab5d2c5caf4da19deacef41f0730019385d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 9 Nov 2022 22:56:19 +0100 Subject: [PATCH] permission changes & minor bug fixes --- Admin/Settings/Theme/Backend/settings.tpl.php | 0 Controller/ApiController.php | 2 +- ICAL.txt | 0 Theme/Backend/Lang/Navigation.ar.lang.php | 0 Theme/Backend/Lang/Navigation.cs.lang.php | 0 Theme/Backend/Lang/Navigation.da.lang.php | 0 Theme/Backend/Lang/Navigation.de.lang.php | 0 Theme/Backend/Lang/Navigation.el.lang.php | 0 Theme/Backend/Lang/Navigation.en.lang.php | 0 Theme/Backend/Lang/Navigation.es.lang.php | 0 Theme/Backend/Lang/Navigation.fi.lang.php | 0 Theme/Backend/Lang/Navigation.fr.lang.php | 0 Theme/Backend/Lang/Navigation.hu.lang.php | 0 Theme/Backend/Lang/Navigation.it.lang.php | 0 Theme/Backend/Lang/Navigation.ja.lang.php | 0 Theme/Backend/Lang/Navigation.ko.lang.php | 0 Theme/Backend/Lang/Navigation.no.lang.php | 0 Theme/Backend/Lang/Navigation.pl.lang.php | 0 Theme/Backend/Lang/Navigation.pt.lang.php | 0 Theme/Backend/Lang/Navigation.ru.lang.php | 0 Theme/Backend/Lang/Navigation.sv.lang.php | 0 Theme/Backend/Lang/Navigation.th.lang.php | 0 Theme/Backend/Lang/Navigation.tr.lang.php | 0 Theme/Backend/Lang/Navigation.uk.lang.php | 0 Theme/Backend/Lang/Navigation.zh.lang.php | 0 Theme/Backend/Lang/ar.lang.php | 0 Theme/Backend/Lang/cs.lang.php | 0 Theme/Backend/Lang/da.lang.php | 0 Theme/Backend/Lang/de.lang.php | 0 Theme/Backend/Lang/el.lang.php | 0 Theme/Backend/Lang/en.lang.php | 0 Theme/Backend/Lang/es.lang.php | 0 Theme/Backend/Lang/fi.lang.php | 0 Theme/Backend/Lang/fr.lang.php | 0 Theme/Backend/Lang/hu.lang.php | 0 Theme/Backend/Lang/it.lang.php | 0 Theme/Backend/Lang/ja.lang.php | 0 Theme/Backend/Lang/ko.lang.php | 0 Theme/Backend/Lang/no.lang.php | 0 Theme/Backend/Lang/pl.lang.php | 0 Theme/Backend/Lang/pt.lang.php | 0 Theme/Backend/Lang/ru.lang.php | 0 Theme/Backend/Lang/sv.lang.php | 0 Theme/Backend/Lang/th.lang.php | 0 Theme/Backend/Lang/tr.lang.php | 0 Theme/Backend/Lang/uk.lang.php | 0 Theme/Backend/Lang/zh.lang.php | 0 Theme/Backend/support-list.tpl.php | 6 +++--- Theme/Backend/support-ticket.tpl.php | 12 ++++++------ Views/TicketView.php | 4 ++-- tests/Controller/Api/ApiControllerAttributeTrait.php | 0 tests/Controller/Api/ApiControllerTicketTrait.php | 0 tests/Controller/ApiControllerTest.php | 0 tests/Models/NullSupportAppTest.php | 0 tests/Models/NullTicketAttributeTest.php | 0 tests/Models/NullTicketAttributeTypeL11nTest.php | 0 tests/Models/NullTicketAttributeTypeTest.php | 0 tests/Models/NullTicketAttributeValueTest.php | 0 tests/Models/NullTicketElementTest.php | 0 tests/Models/NullTicketTest.php | 0 tests/Models/SupportAppTest.php | 0 tests/Models/TicketAttributeTest.php | 0 tests/Models/TicketAttributeTypeL11nTest.php | 0 tests/Models/TicketAttributeTypeTest.php | 0 tests/Models/TicketAttributeValueTest.php | 0 tests/Models/TicketElementTest.php | 0 tests/Models/TicketTest.php | 0 tests/Views/TicketViewTest.php | 0 68 files changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 Admin/Settings/Theme/Backend/settings.tpl.php mode change 100644 => 100755 ICAL.txt mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ar.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.cs.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.da.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.de.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.el.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.en.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.es.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fi.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.hu.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.it.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ja.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ko.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.no.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pl.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pt.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ru.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.sv.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.th.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.tr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.uk.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.zh.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ar.lang.php mode change 100644 => 100755 Theme/Backend/Lang/cs.lang.php mode change 100644 => 100755 Theme/Backend/Lang/da.lang.php mode change 100644 => 100755 Theme/Backend/Lang/de.lang.php mode change 100644 => 100755 Theme/Backend/Lang/el.lang.php mode change 100644 => 100755 Theme/Backend/Lang/en.lang.php mode change 100644 => 100755 Theme/Backend/Lang/es.lang.php mode change 100644 => 100755 Theme/Backend/Lang/fi.lang.php mode change 100644 => 100755 Theme/Backend/Lang/fr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/hu.lang.php mode change 100644 => 100755 Theme/Backend/Lang/it.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ja.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ko.lang.php mode change 100644 => 100755 Theme/Backend/Lang/no.lang.php mode change 100644 => 100755 Theme/Backend/Lang/pl.lang.php mode change 100644 => 100755 Theme/Backend/Lang/pt.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ru.lang.php mode change 100644 => 100755 Theme/Backend/Lang/sv.lang.php mode change 100644 => 100755 Theme/Backend/Lang/th.lang.php mode change 100644 => 100755 Theme/Backend/Lang/tr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/uk.lang.php mode change 100644 => 100755 Theme/Backend/Lang/zh.lang.php mode change 100644 => 100755 tests/Controller/Api/ApiControllerAttributeTrait.php mode change 100644 => 100755 tests/Controller/Api/ApiControllerTicketTrait.php mode change 100644 => 100755 tests/Controller/ApiControllerTest.php mode change 100644 => 100755 tests/Models/NullSupportAppTest.php mode change 100644 => 100755 tests/Models/NullTicketAttributeTest.php mode change 100644 => 100755 tests/Models/NullTicketAttributeTypeL11nTest.php mode change 100644 => 100755 tests/Models/NullTicketAttributeTypeTest.php mode change 100644 => 100755 tests/Models/NullTicketAttributeValueTest.php mode change 100644 => 100755 tests/Models/NullTicketElementTest.php mode change 100644 => 100755 tests/Models/NullTicketTest.php mode change 100644 => 100755 tests/Models/SupportAppTest.php mode change 100644 => 100755 tests/Models/TicketAttributeTest.php mode change 100644 => 100755 tests/Models/TicketAttributeTypeL11nTest.php mode change 100644 => 100755 tests/Models/TicketAttributeTypeTest.php mode change 100644 => 100755 tests/Models/TicketAttributeValueTest.php mode change 100644 => 100755 tests/Models/TicketElementTest.php mode change 100644 => 100755 tests/Models/TicketTest.php mode change 100644 => 100755 tests/Views/TicketViewTest.php diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php old mode 100644 new mode 100755 diff --git a/Controller/ApiController.php b/Controller/ApiController.php index d895155..17ea614 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -113,7 +113,7 @@ final class ApiController extends Controller */ private function createTicketFromRequest(RequestAbstract $request) : Ticket { - $request->setData('redirect', '{/prefix}support/ticket?for={?id}'); + $request->setData('redirect', 'support/ticket?for={?id}'); $task = $this->app->moduleManager->get('Tasks')->createTaskFromRequest($request); $task->setType(TaskType::HIDDEN); diff --git a/ICAL.txt b/ICAL.txt old mode 100644 new mode 100755 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/support-list.tpl.php b/Theme/Backend/support-list.tpl.php index c35456c..a7bc7f6 100755 --- a/Theme/Backend/support-list.tpl.php +++ b/Theme/Backend/support-list.tpl.php @@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?> $ticket) : ++$c; - $url = UriFactory::build('{/prefix}support/ticket?{?}&id=' . $ticket->getId()); + $url = UriFactory::build('support/ticket?{?}&id=' . $ticket->getId()); ?> @@ -49,9 +49,9 @@ echo $this->getData('nav')->render(); ?> getHtml('P' . $ticket->task->getPriority(), 'Tasks'); ?> printHtml($ticket->task->title); ?> - printHtml($ticket->task->createdBy->name1); ?> printHtml($ticket->task->createdBy->name2); ?> + printHtml($ticket->task->createdBy->name1); ?> printHtml($ticket->task->createdBy->name2); ?> printHtml($ticket->task->createdBy->name1); ?> printHtml($ticket->task->createdBy->name2); ?> - printHtml($ticket->for->name1); ?> printHtml($ticket->for->name2); ?> + printHtml($ticket->for->name1); ?> printHtml($ticket->for->name2); ?> printHtml($ticket->task->createdAt->format('Y-m-d H:i')); ?> getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/support-ticket.tpl.php b/Theme/Backend/support-ticket.tpl.php index a581695..e2e7c75 100755 --- a/Theme/Backend/support-ticket.tpl.php +++ b/Theme/Backend/support-ticket.tpl.php @@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
- name; ?> + name; ?>
@@ -180,7 +180,7 @@ echo $this->getData('nav')->render(); ?>
getHtml('status_change'), - '' . $this->printHtml($element->taskElement->createdBy->name1) . '', + '' . $this->printHtml($element->taskElement->createdBy->name1) . '', $element->taskElement->createdAt->format('Y-m-d H:i') ); ?> @@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); ?>
getHtml('priority_change'), - '' . $this->printHtml($element->taskElement->createdBy->name1) . '', + '' . $this->printHtml($element->taskElement->createdBy->name1) . '', $element->taskElement->createdAt->format('Y-m-d H:i') ); ?> @@ -245,7 +245,7 @@ echo $this->getData('nav')->render(); ?> @@ -291,10 +291,10 @@ echo $this->getData('nav')->render(); ?> ) : ?>
- printHtml($element->taskElement->createdBy->name1); ?> getHtml('forwarded_to'); ?> + printHtml($element->taskElement->createdBy->name1); ?> getHtml('forwarded_to'); ?> - printHtml($to->getRelation()->name1); ?> + printHtml($to->getRelation()->name1); ?> printHtml($to->getRelation()->name); ?> diff --git a/Views/TicketView.php b/Views/TicketView.php index 33bc12c..a5cf594 100755 --- a/Views/TicketView.php +++ b/Views/TicketView.php @@ -70,10 +70,10 @@ class TicketView extends View $profile = ProfileMapper::get()->with('image')->where('account', $account)->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/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php old mode 100644 new mode 100755 diff --git a/tests/Controller/Api/ApiControllerTicketTrait.php b/tests/Controller/Api/ApiControllerTicketTrait.php old mode 100644 new mode 100755 diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullSupportAppTest.php b/tests/Models/NullSupportAppTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullTicketAttributeTest.php b/tests/Models/NullTicketAttributeTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullTicketAttributeTypeL11nTest.php b/tests/Models/NullTicketAttributeTypeL11nTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullTicketAttributeTypeTest.php b/tests/Models/NullTicketAttributeTypeTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullTicketAttributeValueTest.php b/tests/Models/NullTicketAttributeValueTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullTicketElementTest.php b/tests/Models/NullTicketElementTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullTicketTest.php b/tests/Models/NullTicketTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/SupportAppTest.php b/tests/Models/SupportAppTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/TicketAttributeTest.php b/tests/Models/TicketAttributeTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/TicketAttributeTypeL11nTest.php b/tests/Models/TicketAttributeTypeL11nTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/TicketAttributeTypeTest.php b/tests/Models/TicketAttributeTypeTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/TicketAttributeValueTest.php b/tests/Models/TicketAttributeValueTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/TicketElementTest.php b/tests/Models/TicketElementTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/TicketTest.php b/tests/Models/TicketTest.php old mode 100644 new mode 100755 diff --git a/tests/Views/TicketViewTest.php b/tests/Views/TicketViewTest.php old mode 100644 new mode 100755