Browse Source

Fix to include defaults like modified, to avoid updating timestamp.

dereuromark 9 years ago
parent
commit
8f4076f663
1 changed files with 6 additions and 0 deletions
  1. 6 0
      Model/Behavior/ResetBehavior.php

+ 6 - 0
Model/Behavior/ResetBehavior.php

@@ -115,6 +115,11 @@ class ResetBehavior extends ModelBehavior {
 				$fieldList = $params['fields'];
 				$fieldList = $params['fields'];
 				if (!empty($updateFields)) {
 				if (!empty($updateFields)) {
 					$fieldList = $updateFields;
 					$fieldList = $updateFields;
+					foreach ($defaults['fields'] as $field) {
+						if (!in_array($field, $fieldList)) {
+							$fieldList[] = $field;
+						}
+					}
 				}
 				}
 				if ($fieldList && !in_array($Model->primaryKey, $fieldList)) {
 				if ($fieldList && !in_array($Model->primaryKey, $fieldList)) {
 					$fieldList[] = $Model->primaryKey;
 					$fieldList[] = $Model->primaryKey;
@@ -132,6 +137,7 @@ class ResetBehavior extends ModelBehavior {
 					}
 					}
 				}
 				}
 
 
+dd($fieldList);
 				$res = $Model->save($row, compact('validate', 'fieldList'));
 				$res = $Model->save($row, compact('validate', 'fieldList'));
 				if (!$res) {
 				if (!$res) {
 					throw new CakeException(print_r($Model->validationErrors, true));
 					throw new CakeException(print_r($Model->validationErrors, true));