Merge branch 'hotline#132508_vignettes_nanook_bokeh' into 'hotline'

hotline#132508 : Systeme : warnings when launching thumbnails_from_marc on...

See merge request !4020

cosmogramme/VERSIONS_HOTLINE/132508

+ - ticket #132508 : Système : gestion des types de doc sans profils pour la récupération de la vignette
\ No newline at end of file

library/Class/Notice/ThumbnailFields.php

@@ -37,6 +37,9 @@ class Class_Notice_ThumbnailFields {
     $fields = $this->_definitionFor($record);
 
     foreach ($fields as $field) {
+      if (!preg_match('/[0-9]{3}-[a-zA-Z0-9]/',$field))
+        continue;
+
       list($zone, $subfield) = explode('-', $field);
       $values = $record->get_subfield($zone, $subfield);
       if ($image = $this->_firstImageInFields($values))

tests/library/Class/Notice/Thumbnail/UpdateFromFieldsTest.php

@@ -41,14 +41,21 @@ class Class_Notice_Thumbnail_UpdateFromFieldsTest extends ModelTestCase {
                               'url_vignette' => 'NO',
                               'url_image' => 'NO']);
 
+    $record2 = $this->fixture(Class_Notice::class,
+                             ['id' => 456,
+                              'type_doc' => 2,
+                              'unimarc' => $marc->render(),
+                              'url_vignette' => 'NO',
+                              'url_image' => 'NO']);
+
     $alread_called = false;
     $this->onLoaderOfModel(Class_Notice::class)
          ->whenCalled('findAllBy')
-         ->willDo(function() use(&$alread_called, $record)
+         ->willDo(function() use(&$alread_called, $record, $record2)
                   {
                     if (!$alread_called) {
                       $alread_called = true;
-                      return [$record];
+                      return [$record, $record2];
                     }
 
                     return [];
@@ -72,4 +79,13 @@ class Class_Notice_Thumbnail_UpdateFromFieldsTest extends ModelTestCase {
   public function recordUrlImageShouldBeUpdated() {
     $this->assertEquals('http://url.to/image.jpg', Class_Notice::find(123)->getUrlImage());
   }
+
+
+  /**
+   * @see https://forge.afi-sa.net/issues/132508
+   * @test
+   */
+  public function recordWithTypeDoc2AndEmptyThumbnailFieldDefinedUrlImageShouldBeNO() {
+    $this->assertEquals('NO', Class_Notice::find(456)->getUrlImage());
+  }
 }