From f185558de74f846cfa68d05399f828f8453ce533 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 2 Aug 2019 13:48:48 +0400 Subject: [PATCH 1/3] PHRAS-2688 #comment Port 41 of Prod workzone: Change type of numbering #time 1h --- 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 a362540935..12685f1119 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php @@ -317,7 +317,7 @@ class QueryController extends Controller ' . '' - . $this->app->trans('%total% reponses', ['%total%' => ''.$result->getTotal().'']) . ''; + . $this->app->trans('%total% reponses', ['%total%' => ''.number_format($result->getTotal(),null, null, ' ').'']) . ''; $json['infos'] = $infoResult; $json['navigationTpl'] = $string; From 8987e2dba5cf066c8b69dba4dd51e0d16c6fef54 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 13 Aug 2019 11:39:57 +0400 Subject: [PATCH 2/3] PHRAS-2688 commit to run ccircle ci test --- lib/Alchemy/Phrasea/Controller/Prod/QueryController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php index 12685f1119..1e8724c0ee 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php @@ -179,7 +179,6 @@ class QueryController extends Controller }; $userManipulator->setUserSetting($user, 'last_jsonquery', (string)$request->request->get('jsQuery')); - $jsQuery = @json_decode((string)$request->request->get('jsQuery'), true); if(($ft = $findFulltext($jsQuery['query'])) !== null) { $userManipulator->setUserSetting($user, 'start_page_query', $ft); From 80dcf98e1f34abbabce54b470845319deaf7051e Mon Sep 17 00:00:00 2001 From: aynsix Date: Mon, 19 Aug 2019 15:24:04 +0400 Subject: [PATCH 3/3] fix basket browser windows nok --- templates/web/prod/WorkZone/Browser/Results.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 47ba7802dd..71c0cc038a 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -69,7 +69,7 @@ {% if Basket.getPusher() %}

- {% set user_name = '' ~ Basket.getPusher(app).get_display_name() ~ '' %} + {% set user_name = '' ~ Basket.getPusher(app).getDisplayName() ~ '' %} {% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}

{% endif %}