From 4febd38154bf7504c5f9a59db73cd7ba11048736 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 1 Apr 2020 14:46:34 +0400 Subject: [PATCH 1/2] PHRAS-2999 #comment remove Detail info block --- lib/Alchemy/Phrasea/Controller/Prod/QueryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php index 8afd22d2b3..d4830859c2 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php @@ -269,7 +269,7 @@ class QueryController extends Controller $infoResult = '
' . $this->app->trans('%number% documents
selectionnes', ['%number%' => '']) - . '
' + . '
' . '
From 5229eba49e5d0f37764344495bd3af82bb8197d6 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 1 Apr 2020 16:35:48 +0400 Subject: [PATCH 2/2] PHRAS-3005 #comment fix error on feedback-date --- templates/web/prod/Tooltip/Basket.html.twig | 2 +- templates/web/prod/WorkZone/Basket.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/prod/Tooltip/Basket.html.twig b/templates/web/prod/Tooltip/Basket.html.twig index 49eeec04ba..72e51714aa 100644 --- a/templates/web/prod/Tooltip/Basket.html.twig +++ b/templates/web/prod/Tooltip/Basket.html.twig @@ -11,7 +11,7 @@ {% if basket.getValidation() %} {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} - {% if date(dateExpired) < date() %} + {% if basket.getValidation().getExpires() < date() %} {{ 'workzone:feedback:expiration-closed' | trans }} : {% else %} {{ 'workzone:feedback:expiration-open' | trans }} : diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig index a307ba572b..8eaaec2b48 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -101,7 +101,7 @@ {% set dateExpired = app['date-formatter'].getTranslatedDate(basket.getValidation().getExpires()) %}
- {% if date(dateExpired) < date() %} + {% if basket.getValidation().getExpires() < date() %} {{ 'workzone:feedback:expiration-closed' | trans }} : {% else %} {{ 'workzone:feedback:expiration-open' | trans }} :