[TASK] Remove uc option helpText completely 49/35849/2
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 6 Jan 2015 22:14:30 +0000 (23:14 +0100)
committerBenjamin Mack <benni@typo3.org>
Tue, 6 Jan 2015 23:00:04 +0000 (00:00 +0100)
This was already removed since 4.5 but a leftover
still exists in the permission module.

Resolves: #64152
Releases: master
Change-Id: I17a084dc997ee9407edab014a21709b8a63405aa
Reviewed-on: http://review.typo3.org/35849
Reviewed-by: Benjamin Kott <info@bk2k.info>
Tested-by: Benjamin Kott <info@bk2k.info>
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Felix Kopp <felix-source@phorax.com>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
typo3/sysext/beuser/Classes/Controller/PermissionController.php
typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php

index 0feec07..e6ab801 100644 (file)
@@ -318,10 +318,6 @@ class PermissionController extends ActionController {
                        $this->view->assign('pageInfo', $this->pageInfo);
                        $this->view->assign('returnId', $this->returnId);
                        $this->view->assign('recursiveSelectOptions', $this->getRecursiveSelectOptions());
-                       // Adding help text:
-                       if ($this->getBackendUser()->uc['helpText']) {
-                               $this->view->assign('showHelp', TRUE);
-                       }
                }
        }
 
index b15fc60..d03f20b 100644 (file)
 
                <f:form.hidden name="redirect" value="{f:uri.action(action: 'index', arguments: {lastEdited: id, id: returnId})}" />
        </f:form>
-       <f:if condition="{showHelp}">
-               <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" /></h3>
-               <p>
-                       <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /> <br />
-                       <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /> <br />
-                       <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /> <br />
-                       <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /> <br />
-                       <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" />
-               </p>
-               <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
-       </f:if>
+
+       <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" /></h3>
+       <p>
+               <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /> <br />
+               <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16_t" /> <br />
+               <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2_t" /> <br />
+               <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /> <br />
+               <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" />
+       </p>
+       <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
+
        <script type="text/javascript">
                require(["jquery", "TYPO3/CMS/Beuser/Permissions"], function($, Permissions) {
                        Permissions.setCheck("check[perms_user]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]");
index d370b5e..6041114 100644 (file)
@@ -306,7 +306,6 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
                'emailMeAtLogin' => 0,
                'startModule' => 'help_AboutmodulesAboutmodules',
                'hideSubmoduleIcons' => 0,
-               'helpText' => 1,
                'titleLen' => 50,
                'edit_showFieldHelp' => 'icon',
                'edit_RTE' => '1',