Merge branch...

Merge branch 'hotline#68332_champ_personnalise_supprime_qui_s_affiche_toujours_dans_les_filtres_de_recherche_de_l_agenda' into 'stable'

hotline #68332 fix custom_field_values deletion when article deleted

See merge request !2459

VERSIONS_HOTLINE/68332

+ - ticket #68332 : lorsqu'un article est supprimé, correction de la suppression des valeurs des champs personnalisés associés
\ No newline at end of file

library/ZendAfi/Controller/Plugin/Manager/Article.php

@@ -94,6 +94,8 @@ class ZendAfi_Controller_Plugin_Manager_Article extends ZendAfi_Controller_Plugi
       return;
     }
 
+    $values = $this->_getCustomFieldModelValues($article);
+    $values->deleteValues();
     $article->delete();
     $this->withOtherPluginsDo(function($plugin) use($article)
                               {

tests/application/modules/admin/controllers/CmsControllerCustomFieldsTest.php

@@ -56,7 +56,7 @@ abstract class CmsControllerCustomFieldsTestCase extends AbstractControllerTestC
 
 
     $this->_custom_field = $this->fixture('Class_CustomField',
- ['id' => 5,
+                                          ['id' => 5,
                                            'priority' => 3,
                                            'meta' => $meta,
                                            'model' => 'Article']);
@@ -71,6 +71,7 @@ abstract class CmsControllerCustomFieldsTestCase extends AbstractControllerTestC
 
 
 
+
 class CmsControllerCustomFieldsEditActionTest extends CmsControllerCustomFieldsTestCase {
   public function setUp() {
     parent::setUp();
@@ -92,6 +93,37 @@ class CmsControllerCustomFieldsEditActionTest extends CmsControllerCustomFieldsT
 
 
 
+
+class CmsControllerCustomFieldsWithNewbiesSetActionTest extends CmsControllerCustomFieldsTestCase {
+  public function setUp() {
+    parent::setUp();
+    $this->fixture('Class_CustomField_Value',
+                   ['id' => 10,
+                    'model_id' => 1,
+                    'custom_field_id' => 5,
+                    'value' => 'newbies']);
+  }
+
+
+  /** @test */
+  public function editActionShouldHaveNewbiesOptionSelected() {
+    $this->dispatch('admin/cms/edit/id/1' ,true);
+    $this->assertXPathContentContains('//select[@name="field_5"]//option[@selected="selected"]',
+                                      'newbies');
+  }
+
+
+  /** @test */
+  public function deleteActionShouldDeleteAssociatedCustomFieldValue() {
+    $this->dispatch('admin/cms/force-delete/id/1' ,true);
+    Class_CustomField_Value::clearCache();
+    $this->assertNull(Class_CustomField_Value::find(10));
+  }
+}
+
+
+
+
 class CmsControllerCustomFieldsAndIndexationPostEditActionTest
   extends CmsControllerCustomFieldsTestCase {
   protected