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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Yagami
2019-11-27 17:14:21 +08:00
parent 97bae2e030 208852492f
commit 3dd1428078
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/control.class.php
+15 -3
View File
@@ -41,10 +41,22 @@ class control extends baseControl
{
$this->checkRequireFlowField();
if(isset($this->config->{$this->moduleName}) and isset($this->config->{$this->moduleName}->exportFields) and strpos($this->methodName, 'export') !== false)
if(isset($this->config->{$this->moduleName}) and strpos($this->methodName, 'export') !== false)
{
$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}";
if(isset($this->config->{$this->moduleName}->exportFields) or isset($this->config->{$this->moduleName}->list->exportFields))
{
$exportFields = $this->dao->select('*')->from(TABLE_WORKFLOWFIELD)->where('module')->eq($this->moduleName)->andWhere('canExport')->eq('1')->andWhere('buildin')->eq('0')->fetchAll('field');
if(isset($this->config->{$this->moduleName}->exportFields))
{
foreach($exportFields as $field) $this->config->{$this->moduleName}->exportFields .= ",{$field->field}";
}
if(isset($this->config->{$this->moduleName}->list->exportFields))
{
foreach($exportFields as $field) $this->config->{$this->moduleName}->list->exportFields .= ",{$field->field}";
}
}
}
}
}
module/custom/lang/en.php
+1 -1
View File
@@ -98,7 +98,7 @@ $lang->custom->notice->invalidStringKey = 'The key should be lowercase letters,
$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
$lang->custom->notice->noClosedBlock = 'You have no blocks that are closed permanently.';
$lang->custom->notice->required = 'The selected field is required.';
$lang->custom->notice->conceptResult = 'According to your preference, <b> %s-%s </b> is set for you. Use <b>%s</b> + <b> %s</b>。';
$lang->custom->notice->conceptResult = 'According to your preference, <b> %s-%s </b> is set for you. Use <b>%s</b> + <b> %s</b>.';
$lang->custom->notice->conceptPath = 'Go to Admin -> Custom -> Concept to set it.';
$lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home?";
module/story/lang/en.php
+1 -1
View File
@@ -76,7 +76,7 @@ $lang->story->assign = 'Assign';
$lang->story->verify = 'Acceptance';
$lang->story->pri = 'Priority';
$lang->story->estimate = "Estimates {$lang->hourCommon}";
$lang->story->estimateAB = 'Est.' . $lang->hourCommon == 'hour' ? '(h)' : '(sp)';
$lang->story->estimateAB = 'Est.' . $lang->hourCommon == 'hour' ? '(h)' : '(SP)';
$lang->story->hour = $lang->hourCommon;
$lang->story->status = 'Status';
$lang->story->subStatus = 'Sub Status';