Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

revert 5455d817d5

Browse Source 
revert * form: renamed the $config parameter to $fieldConfig to distinguish it from the global $config variable.
This commit is contained in:
刘刚
2023-05-17 13:27:43 +08:00
parent 62aafa3b34
commit f3fc4bb9a4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/form/form.class.php
+10 -10
View File
@@ -104,22 +104,22 @@ class form extends baseFixer
* Convert the field type.
*
* @param string $field
* @param array $fieldConfig
* @param array $config
* @return void
*/
public function convertField(string $field, array $fieldConfig)
public function convertField(string $field, array $config)
{
global $app;
if(!isset($fieldConfig['type']))
if(!isset($config['type']))
{
if(!isset($this->errors[$field])) $this->errors[$field] = array();
$this->errors[$field][] = "Field '{$field}' need defined type";
}
if(isset($fieldConfig['required']) && $fieldConfig['required'])
if(isset($config['required']) && $config['required'])
{
if(!isset($fieldConfig['default']) && (!isset($this->rawdata->$field) || $this->rawdata->$field === ''))
if(!isset($config['default']) && (!isset($this->rawdata->$field) || $this->rawdata->$field === ''))
{
if(!isset($this->errors[$field])) $this->errors[$field] = array();
$fieldName = isset($app->lang->{$app->rawModule}->$field) ? $app->lang->{$app->rawModule}->$field : $field;
@@ -132,16 +132,16 @@ class form extends baseFixer
$data = $this->rawdata->$field;
}
if(isset($fieldConfig['default']) && !isset($this->rawdata->$field))
if(isset($config['default']) && !isset($this->rawdata->$field))
{
$data = $fieldConfig['default'];
$data = $config['default'];
}
$data = helper::convertType($data, $fieldConfig['type']);
$data = helper::convertType($data, $config['type']);
if(isset($fieldConfig['filter']))
if(isset($config['filter']))
{
$data = $this->filter($data, $fieldConfig['filter']);
$data = $this->filter($data, $config['filter']);
}
$this->data->$field = $data;