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

* code for task #9246.

Browse Source
This commit is contained in:
wangyidong
2019-10-31 14:36:46 +08:00
parent e5c46baa1c
commit e70fec4e04
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/control.class.php
View File

@@ -36,15 +36,11 @@ class control extends baseControl
if(!isset($this->config->bizVersion)) return false;
/* Code for task #9224. Set requiredFields for workflow. */
$fields = $this->loadModel('workflowaction')->getFields($this->moduleName, $this->methodName);
$exportFields = $this->dao->select('*')->from(TABLE_WORKFLOWFIELD)->where('module')->eq($this->moduleName)->andWhere('canExport')->eq('1')->andWhere('buildin')->eq('0')->fetchAll('field');
$layouts = $this->loadModel('workflowlayout')->getFields($this->moduleName, $this->methodName);
$notEmptyRule = $this->loadModel('workflowrule')->getByTypeAndRule('system', 'notempty');
foreach($fields as $field)
{
if(isset($exportFields[$field->field]) and isset($this->config->{$this->moduleName}) and isset($this->config->{$this->moduleName}->exportFields))
{
$this->config->{$this->moduleName}->exportFields .= ",{$field->field}";
}
if($notEmptyRule && strpos(",$field->rules,", ",$notEmptyRule->id,") !== false)
{
@@ -54,6 +50,12 @@ class control extends baseControl
$this->config->{$this->moduleName}->{$this->methodName}->requiredFields .= ",{$field->field}";
}
}
if(isset($this->config->{$this->moduleName}) and isset($this->config->{$this->moduleName}->exportFields))
{
$exportFields = $this->dao->select('*')->from(TABLE_WORKFLOWFIELD)->where('module')->eq($this->moduleName)->andWhere('canExport')->eq('1')->andWhere('buildin')->eq('0')->fetchAll('field');
foreach($exportFields as $field) $this->config->{$this->moduleName}->exportFields .= ",{$field->field}";
}
}
/**