From c2f55eb8ba080a5410345f372b42a66ff52749e9 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 16 Jul 2019 15:12:26 +0400 Subject: [PATCH 1/3] PHRAS-2668 #comment fix twig error #time 1h --- cache/.gitkeep | 0 templates/web/common/index_bootstrap.html.twig | 2 +- templates/web/prod/index.html.twig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 cache/.gitkeep diff --git a/cache/.gitkeep b/cache/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig index 6249ef8e66..9b9f27a228 100644 --- a/templates/web/common/index_bootstrap.html.twig +++ b/templates/web/common/index_bootstrap.html.twig @@ -32,7 +32,7 @@ {% endblock %} - +
{% include 'common/menubar.html.twig' %}
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index d2b34b8ff1..73adc3534e 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -146,7 +146,7 @@ $(document).ready(function(){ prodApp.appEvents.emit('workzone.doRemoveWarning', "{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), "warning_on_delete_story") %}true{% else %}false{% endif %}"); prodApp.appEvents.emit('search.updateFacetData'); - + $('body').addClass('{{ cssfile }}') }); From 49f6ff58ee1c3cca187837ecc12547980ce1f15c Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Tue, 16 Jul 2019 18:10:25 +0200 Subject: [PATCH 2/3] Update index.html.twig --- templates/web/prod/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 73adc3534e..c5cde9d778 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -146,7 +146,7 @@ $(document).ready(function(){ prodApp.appEvents.emit('workzone.doRemoveWarning', "{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), "warning_on_delete_story") %}true{% else %}false{% endif %}"); prodApp.appEvents.emit('search.updateFacetData'); - $('body').addClass('{{ cssfile }}') + $('body').addClass('{{ cssfile }}'); }); From e06a281dd061258834dc6aa0d8cd98c051271db6 Mon Sep 17 00:00:00 2001 From: aynsix Date: Thu, 18 Jul 2019 12:17:44 +0400 Subject: [PATCH 3/3] add index on table notifications --- lib/Alchemy/Phrasea/Core/Version.php | 2 +- lib/conf.d/bases_structure.xml | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index b2bf620798..0e15108724 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -16,7 +16,7 @@ class Version /** * @var string */ - private $number = '4.1.0-alpha.14a'; + private $number = '4.1.0-alpha.15a'; /** * @var string diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml index a4d0d2f9c5..a666eaeb5c 100644 --- a/lib/conf.d/bases_structure.xml +++ b/lib/conf.d/bases_structure.xml @@ -1278,6 +1278,27 @@ id + + usr_id + INDEX + + usr_id + + + + unread + INDEX + + unread + + + + created_on + INDEX + + created_on + + InnoDB