From 70404d7b9c37c75cad047767dc48eff4a9100b32 Mon Sep 17 00:00:00 2001 From: Paul Ilea <paul@sgalinski.de> Date: Thu, 29 Jun 2017 17:17:36 +0300 Subject: [PATCH] [BUGFIX] BE module fixes --- Resources/Private/Templates/Queue/Index.html | 10 +++++++--- .../Backend/Widget/Paginate/Index.html | 16 ++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html index 26936e22..4a0673c2 100644 --- a/Resources/Private/Templates/Queue/Index.html +++ b/Resources/Private/Templates/Queue/Index.html @@ -15,10 +15,12 @@ <sgm:backend.widget.paginate objects="{queue}" as="paginatedMails" configuration="{insertAbove: 1, itemsPerPage: 20}"> <tbody> <f:for each="{paginatedMails}" as="mail"> - {sgm:backend.editOnClick(table: 'tx_sgmail_domain_model_mail', uid: mail.uid) -> sgm:set(name: 'editOnClick')} + {sgm:backend.editOnClick(table: 'tx_sgmail_domain_model_mail', uid: mail.uid) -> sgm:set(name: 'editOnClick') -> f:format.raw()} <tr data-uid="{mail.uid}"> <td nowrap="nowrap" class="col-icon"> - <sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" /> + <f:format.raw> + <sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" /> + </f:format.raw> </td> <td nowrap="nowrap"> <a href="#" onclick="{editOnClick}"> @@ -26,7 +28,9 @@ </a> </td> <td nowrap="nowrap" class="col-control"> - <sgm:backend.control table="tx_sgmail_domain_model_mail" row="{mail}" /> + <f:format.raw> + <sgm:backend.control table="tx_sgmail_domain_model_mail" row="{mail}" /> + </f:format.raw> </td> <td> <f:if condition="{mail.sent} == '0'"> diff --git a/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html b/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html index 6ee74c1a..50dfbed4 100644 --- a/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html +++ b/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html @@ -71,19 +71,11 @@ <form id="paginator-form-{position}" onsubmit="goToPage{position}(this); return false;" style="display:inline;"> <script type="text/javascript"> - function goToPage { - position - } - (formObject) - { - var url = '{sg:widget.uri(arguments:{currentPage: 987654321})}'; + function goToPage{position}(formObject) { + var url = '{sg:widget.uri(arguments:{currentPage: 987654321}) -> f:format.raw()}'; var page = formObject.elements['paginator-target-page'].value; - if (page > {pagination.numberOfPages} - ) - { - page = {pagination.numberOfPages - } - ; + if (page > {pagination.numberOfPages}) { + page = {pagination.numberOfPages}; } else if (page < 1) { -- GitLab