* Fix bug#41663.
This commit is contained in:
@@ -23,7 +23,6 @@ $fnGenerateFields = function() use ($lang, $fields, $stories, $customFields, $sh
|
||||
$items = array();
|
||||
$items[] = array('name' => 'id', 'label' => $lang->idAB, 'control' => 'index', 'width' => '32px');
|
||||
if($stories) $items[] = array('name' => 'uploadImage', 'label' => '', 'control' => 'hidden', 'hidden' => true);
|
||||
if(strpos(",$showFields,", ",source,") == false) unset($fields['sourceNote']);
|
||||
unset($fields['color']);
|
||||
|
||||
$cols = array_merge($items, array_map(function($name, $field)
|
||||
@@ -44,7 +43,8 @@ $fnGenerateFields = function() use ($lang, $fields, $stories, $customFields, $sh
|
||||
foreach($cols as $index => $col)
|
||||
{
|
||||
$colName = $col['name'];
|
||||
if(isset($customFields[$colName]) && strpos(",$showFields,", ",$colName,") == false) $cols[$index]['hidden'] = true;
|
||||
if(isset($customFields[$colName]) && strpos(",$showFields,", ",$colName,") === false) $cols[$index]['hidden'] = true;
|
||||
if($colName == 'sourceNote' && strpos(",$showFields,", ",source,") === false) $cols[$index]['hidden'] = true;
|
||||
}
|
||||
return $cols;
|
||||
};
|
||||
|
||||
@@ -30,6 +30,8 @@ foreach($fields as $fieldName => $field)
|
||||
if($fieldName == 'color') continue;
|
||||
if(isset($field['options']) && $field['options'] == 'users') $field['options'] = $users;
|
||||
$items[$fieldName] = array('name' => $fieldName, 'label' => zget($lang->story, $fieldName), 'control' => $field['control'], 'width' => $field['width'], 'required' => $field['required'], 'items' => zget($field, 'options', array()));
|
||||
if(isset($customFields[$fieldName]) && strpos(",$showFields,", ",$fieldName,") === false) $items[$fieldName]['hidden'] = true;
|
||||
if($fieldName == 'sourceNote' && strpos(",$showFields,", ",source,") === false) $items['sourceNote']['hidden'] = true;
|
||||
}
|
||||
$items['title']['inputClass'] = 'filter-none';
|
||||
$items['assignedTo']['ditto'] = true;
|
||||
@@ -39,6 +41,12 @@ $items['assignedTo']['defaultDitto'] = 'off';
|
||||
$items['source']['defaultDitto'] = 'off';
|
||||
$items['stage']['defaultDitto'] = 'off';
|
||||
|
||||
if($storyType == 'requirement')
|
||||
{
|
||||
unset($items['plan']);
|
||||
unset($items['stage']);
|
||||
}
|
||||
|
||||
if(!$branchProduct) unset($items['branch'], $customFields['branch']);
|
||||
|
||||
/* Build form field value for batch edit. */
|
||||
|
||||
Reference in New Issue
Block a user