Merge pull request #77 from OpenBuildings/error-message-improvement

EZarkov · web-flow · commit 2f347ba65871 · 2017-07-14T11:54:50.000+03:00
Add name parameter to error messages
diff --git a/classes/Kohana/Jam/Errors.php b/classes/Kohana/Jam/Errors.php
@@ -102,6 +102,7 @@ public function messages($attribute = NULL)
 				{
 					$messages[] = Jam_Errors::message($this->_error_filename, $attribute_name, $error, Arr::merge($params, array(
 						':model' => $this->_meta->model(),
+						':name' => $this->_model->name(),
 						':attribute' => Jam_Errors::attribute_label($this->_meta, $attribute_name),
 					)));
 				}
@@ -150,6 +151,7 @@ private function _add_messages_all(Jam_Validated $model, array & $messages)
 
 					$messages[] = $model_name.': '.Jam_Errors::message($model->meta()->errors_filename(), $attribute_name, $error, Arr::merge($params, array(
 						':model' => $model->meta()->model(),
+						':name' => $model->name(),
 						':attribute' => Jam_Errors::attribute_label($model->meta(), $attribute_name),
 					)));
 				}

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public function messages($attribute = NULL)`
`102`	`102`	`{`
`103`	`103`	`$messages[] = Jam_Errors::message($this->_error_filename, $attribute_name, $error, Arr::merge($params, array(`
`104`	`104`	`':model' => $this->_meta->model(),`
	`105`	`+ ':name' => $this->_model->name(),`
`105`	`106`	`':attribute' => Jam_Errors::attribute_label($this->_meta, $attribute_name),`
`106`	`107`	`)));`
`107`	`108`	`}`
`@@ -150,6 +151,7 @@ private function _add_messages_all(Jam_Validated $model, array & $messages)`
`150`	`151`
`151`	`152`	`$messages[] = $model_name.': '.Jam_Errors::message($model->meta()->errors_filename(), $attribute_name, $error, Arr::merge($params, array(`
`152`	`153`	`':model' => $model->meta()->model(),`
	`154`	`+ ':name' => $model->name(),`
`153`	`155`	`':attribute' => Jam_Errors::attribute_label($model->meta(), $attribute_name),`
`154`	`156`	`)));`
`155`	`157`	`}`