From 30d2a0286f70011b2dee829fe40fb89951f5901a Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Mon, 18 Sep 2017 14:04:49 +0200
Subject: [PATCH] [TASK] Remove fe user stuff
---
Classes/Controller/MailController.php | 4 ----
Classes/Service/BackendService.php | 19 -------------------
Resources/Private/Templates/Mail/Index.html | 4 ----
3 files changed, 27 deletions(-)
diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php
index 1a84815d..6402fcda 100644
--- a/Classes/Controller/MailController.php
+++ b/Classes/Controller/MailController.php
@@ -155,10 +155,6 @@ class MailController extends ActionController {
$colspace = 12;
}
- $users = BackendService::getFrontendUsers();
- array_unshift($users, NULL);
-
- $this->view->assign('users', $users);
$this->view->assign('colspace', $colspace);
$this->view->assign('languageTemplates', $templates);
$this->view->assign('languageLabels', BackendService::getLanguageLabels($languages));
diff --git a/Classes/Service/BackendService.php b/Classes/Service/BackendService.php
index b6ad4ebc..36bfe04b 100644
--- a/Classes/Service/BackendService.php
+++ b/Classes/Service/BackendService.php
@@ -303,25 +303,6 @@ class BackendService {
return $template;
}
- /**
- * get an array of all frontend users
- *
- * @return array
- * @throws \InvalidArgumentException
- */
- public static function getFrontendUsers() {
- $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
- /** @var FrontendUserRepository $frontendUserRepository */
- $frontendUserRepository = $objectManager->get(FrontendUserRepository::class);
-
- /** @var Typo3QuerySettings $querySettings */
- $querySettings = $objectManager->get(Typo3QuerySettings::class);
- $querySettings->setRespectStoragePage(FALSE);
- $querySettings->setRespectSysLanguage(FALSE);
- $frontendUserRepository->setDefaultQuerySettings($querySettings);
- return $frontendUserRepository->findAll()->toArray();
- }
-
/**
* Generate a csv string from the queues, respecting the given filters
*
diff --git a/Resources/Private/Templates/Mail/Index.html b/Resources/Private/Templates/Mail/Index.html
index 5717da40..53958313 100644
--- a/Resources/Private/Templates/Mail/Index.html
+++ b/Resources/Private/Templates/Mail/Index.html
@@ -95,10 +95,6 @@
</f:for>
<div class="col-md-12">
- <div class="row form-group">
- <label for="parameters[templates][{key}][fromUser]" class="">{f:translate(key:'backend.fromUser')}</label>
- <f:form.select class="form-control" property="fromUser" optionValueField="uid" optionLabelField="username" options="{users}" name="parameters[templates][{key}][fromUser]"/>
- </div>
<div class="row form-group">
<label for="parameters[templates][{key}][fromName]" class="">{f:translate(key:'backend.fromName')}</label>
<f:form.textfield type="text" class="form-control" value="{languageTemplate.fromName}" name="parameters[templates][{key}][fromName]" />
--
GitLab