From bd029468b9538069ef1ade6fb5e93a2c2d23d54e Mon Sep 17 00:00:00 2001
From: efalcy <stl@gresille.org>
Date: Tue, 17 Jun 2014 17:49:11 +0200
Subject: [PATCH] dev #14454 autocomplete remove 'de' when author is empty
---
library/Class/Autocomplete/IndexTitle.php | 5 ++++-
.../library/Class/Autocomplete/IndexTest.php | 21 +++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/library/Class/Autocomplete/IndexTitle.php b/library/Class/Autocomplete/IndexTitle.php
index 56d814b8609..937046aa70c 100644
--- a/library/Class/Autocomplete/IndexTitle.php
+++ b/library/Class/Autocomplete/IndexTitle.php
@@ -27,7 +27,10 @@ class Class_Autocomplete_IndexTitle extends Class_Autocomplete_Index {
protected $model_name='Class_Notice';
protected function getRecordData($record) {
- return str_replace('<br />', ': ', $record->getTitrePrincipal() . $this->_(' de ') . $record->getAuteurPrincipal());
+ $author = $record->getAuteurPrincipal() ;
+ if ($author)
+ $author = $this->_(' de ') .$author;
+ return str_replace('<br />', ': ', $record->getTitrePrincipal() . $author);
}
}
?>
\ No newline at end of file
diff --git a/tests/library/Class/Autocomplete/IndexTest.php b/tests/library/Class/Autocomplete/IndexTest.php
index c1674668eae..dcea097c72a 100644
--- a/tests/library/Class/Autocomplete/IndexTest.php
+++ b/tests/library/Class/Autocomplete/IndexTest.php
@@ -69,5 +69,26 @@ class Class_Autocomplete_IndexTest extends Storm_Test_ModelTestCase{
$this->assertTrue(
$this->_file_system->methodHasBeenCalledWithParams('fwrite', [$handle, "Bone of my bones de Charle\n"]));
}
+
+
+ /** @test */
+ public function shouldWriteBoneOfMyBonesWithoutAuthor() {
+ $handle = new stdClass;
+ $this->_file_system
+ ->whenCalled('file_exists')->answers(true)
+ ->whenCalled('fopen')->answers($handle)
+ ->whenCalled('fwrite')->answers(null);
+
+ $this->fixture('Class_Notice',
+ ['id' => 1301,
+ 'titre_principal' => 'Bone of my bones',
+ 'auteur_principal' => '']);
+
+ Class_Autocomplete_Index::indexRecordsTitle();
+
+ $this->assertTrue(
+ $this->_file_system->methodHasBeenCalledWithParams('fwrite', [$handle, "Bone of my bones\n"]));
+ }
+
}
?>
\ No newline at end of file
--
GitLab