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

* [bug#53947,done,1h] Set field name.

Browse Source
This commit is contained in:
daitingting
2024-08-16 17:15:07 +08:00
committed by 綦新志
parent ed57de692d
commit 2b64b892b1
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pivotstate/pivotstate.class.php
+12 -5
View File
@@ -910,7 +910,8 @@ class pivotState
$oldSetting = isset($oldFieldSettings[$field]) ? $oldFieldSettings[$field] : array();
if(!empty($oldSetting))
{
$newFieldSettings[$field] = $this->processFieldSettingLang($field, $oldSetting);
$newFieldSettings[$field] = $this->processFieldSettingLang($field, $oldSetting, $setting);
if($setting['type'] != $oldSetting['type'] && in_array($setting['type'], array('user', 'type'))) $newFieldSettings[$field]['type'] = $setting['type'];
}
else
@@ -1007,17 +1008,23 @@ class pivotState
*
* @param string $field
* @param array $fieldSetting
* @param array $newSetting
* @access public
* @return array
*/
public function processFieldSettingLang($field, $fieldSetting)
public function processFieldSettingLang($field, $oldSetting, $newSetting = array())
{
$lang = $this->clientLang;
if(isset($fieldSetting[$lang])) return $fieldSetting;
if(!empty($oldSetting[$lang])) return $oldSetting;
$fieldSetting[$lang] = isset($fieldSetting['name']) ? $fieldSetting['name'] : $field;
if(!empty($newSetting[$lang]))
{
$oldSetting[$lang] = $newSetting[$lang];
return $oldSetting;
}
return $fieldSetting;
$oldSetting[$lang] = isset($oldSetting['name']) ? $oldSetting['name'] : $field;
return $oldSetting;
}
/**