rel #12993 : delete custom values when model is deleted

library/Class/CustomField/ModelValues.php

@@ -78,6 +78,12 @@ class Class_CustomField_ModelValues {
 	}
 
 
+	public function deleteValues() {
+		foreach($this->getFieldValues() as $value) 
+			$value->delete();
+	}
+
+
 	public function save() {
 		$values = $this->getFieldValues();
 		foreach($values as $value)

library/ZendAfi/Controller/Action.php

@@ -97,6 +97,7 @@ class ZendAfi_Controller_Action extends Zend_Controller_Action {
 	public function deleteAction() {
 		if ($model = $this->_definitions->find($this->_getParam('id'))) {
 			$model->delete();
+			$this->_getCustomFieldModelValues($model)->deleteValues();
 			$this->_helper->notify($this->_definitions->successfulDeleteMessage($model));
 		}
 		$this->_redirectToIndex();

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

@@ -758,6 +758,59 @@ class Admin_UserGroupControllerEditStagiairesPostDataWithCustomFieldsTest extend
 
 
 
+class Admin_UserGroupControllerDeleteGroupWithCustomValuesTest 
+	extends Admin_UserGroupControllerTestCase {
+	public function setUp() {
+		parent::setUp();
+		$this->beCustomized();
+		$this->fixture('Class_CustomField_Value', //age
+									 ['id' => 24,
+										'custom_field_id' => 4,
+										'model_id' => 3,
+										'value' => '25']);
+
+		$this->fixture('Class_CustomField_Value', //status
+									 ['id' => 25,
+										'custom_field_id' => 5,
+										'model_id' => 3,
+										'value' => 'enabled']);
+
+		$this->fixture('Class_CustomField_Value', //age of another group
+									 ['id' => 32,
+										'custom_field_id' => 4,
+										'model_id' => 12,
+										'value' => '25']);
+
+		$this->dispatch('/admin/usergroup/delete/id/3');
+	}
+
+
+	/** @test */
+	public function groupShouldBeDeleted() {
+		$this->assertNull(Class_UserGroup::find(3));
+	}
+
+
+	/** @test */
+	public function customAgeShouldBeDeleted() {
+		$this->assertNull(Class_CustomField_Value::find(24));
+	}
+
+
+	/** @test */
+	public function customStatusShouldBeDeleted() {
+		$this->assertNull(Class_CustomField_Value::find(25));
+	}
+
+
+	/** @test */
+	public function customAgeOfAnotherGroupShouldNotBeDeleted() {
+		$this->assertNotNull(Class_CustomField_Value::find(32));
+	}
+}
+
+
+
 class Admin_UserGroupControllerEditStagiairesWithNotDataRightsInPostTest extends Admin_UserGroupControllerTestCase {
 	protected $_group;