Merge branch 'tanghucheng_feedback_module' into 'master'

* Fix bug export.

See merge request easycorp/zentaopms!5861
This commit is contained in:
王怡栋
2022-10-24 05:35:51 +00:00
2 changed files with 3 additions and 1 deletions
+1 -1
View File
@@ -306,7 +306,7 @@ $config->bug->datatable->fieldList['story']['fixed'] = 'no';
$config->bug->datatable->fieldList['story']['width'] = '120';
$config->bug->datatable->fieldList['story']['required'] = 'no';
$config->bug->datatable->fieldList['story']['control'] = 'select';
$config->bug->datatable->fieldList['story']['dataSource'] = array('module' => 'bug', 'method' =>'getRelatedObjects', 'params' => 'story&id,title');
$config->bug->datatable->fieldList['story']['dataSource'] = array('module' => 'story', 'method' =>'getProductStoryPairs', 'params' => '$productID');
$config->bug->datatable->fieldList['task']['title'] = 'task';
$config->bug->datatable->fieldList['task']['fixed'] = 'no';
+2
View File
@@ -185,6 +185,8 @@ class portModel extends model
*/
public function export($model = '')
{
ini_set('memory_limit', '-1');
$fields = $this->post->exportFields;
/* Init config fieldList */