From 4059f738e777f72610b5184b02d295b3155f5ca1 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Tue, 2 Dec 2014 16:36:20 +0100 Subject: [PATCH] Typo --- .../Phrasea/Model/Entities/ElasticsearchRecord.php | 2 -- .../SearchEngine/Elastic/ElasticsearchRecordHydrator.php | 2 +- .../puphpet/files/dot/ssh/.gitignore | 2 +- templates/web/common/macros.html.twig | 2 +- templates/web/common/technical_datas.html.twig | 8 ++++---- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php b/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php index fd73e7b708..e649546204 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php +++ b/lib/Alchemy/Phrasea/Model/Entities/ElasticsearchRecord.php @@ -267,8 +267,6 @@ class ElasticsearchRecord implements RecordInterface, MutableRecordInterface * Get status of current current as 32 bits binary string * * Eg: 00000000001011100000000000011111 - * - * Where the */ public function getStatus() { diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php index 0d7418d9d4..ea75f32a71 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchRecordHydrator.php @@ -44,4 +44,4 @@ class ElasticsearchRecordHydrator return $record; } -} \ No newline at end of file +} diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore index c021a8ffd8..b1394f8ce6 100644 --- a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/ssh/.gitignore @@ -1,3 +1,3 @@ * !.gitignore -!insecure_private_key \ No newline at end of file +!insecure_private_key diff --git a/templates/web/common/macros.html.twig b/templates/web/common/macros.html.twig index 17fe15bb2a..8ca21a3577 100644 --- a/templates/web/common/macros.html.twig +++ b/templates/web/common/macros.html.twig @@ -132,4 +132,4 @@
{% include 'common/technical_datas.html.twig' %} {% endif %} -{% endmacro %} \ No newline at end of file +{% endmacro %} diff --git a/templates/web/common/technical_datas.html.twig b/templates/web/common/technical_datas.html.twig index a48bf4c29a..64b9de9412 100644 --- a/templates/web/common/technical_datas.html.twig +++ b/templates/web/common/technical_datas.html.twig @@ -1,16 +1,16 @@ -{% if record.isStory %} +{% if record.story %} {{ 'Story_id' | trans }} : {{ record.recordId }}
{% else %} {{ 'Record_id' | trans }} : {{ record.recordId }}
{% endif %} -{% if not record.isStory %} +{% if not record.story %} {% block td_original_name %} - {{ 'Nom Original' | trans }} : {{ record.getOriginalName }} + {{ 'Nom Original' | trans }} : {{ record.originalName }} {% endblock %} {% block td_mime %} - {{ record.getMimeType }} + {{ record.mimeType }} {% endblock %} {% block td_weight %}