From bace517b74b88f9e283c15356dde812f4fa84506 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 23 Jan 2019 09:14:36 +0800 Subject: [PATCH 1/2] * adjust code for saveLogs. --- module/upgrade/model.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 4e7cc7206f..2f0a5ab8a0 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -1118,7 +1118,7 @@ class upgradeModel extends model foreach($oldPriv as $item) { - $this->dao->insert($privTable) + $this->dao->replace($privTable) ->set('company')->eq($item->company) ->set('module')->eq('company') ->set('method')->eq('view') @@ -1134,7 +1134,7 @@ class upgradeModel extends model foreach($oldPriv as $item) { - $this->dao->insert($privTable) + $this->dao->replace($privTable) ->set('company')->eq($item->company) ->set('module')->eq('todo') ->set('method')->eq('batchFinish') @@ -1163,7 +1163,7 @@ class upgradeModel extends model foreach($oldPriv as $item) { - $this->dao->insert($privTable) + $this->dao->replace($privTable) ->set('company')->eq($item->company) ->set('module')->eq('tree') ->set('method')->eq('browseTask') @@ -2952,8 +2952,11 @@ class upgradeModel extends model public function saveLogs($log) { $logFile = $this->app->getTmpRoot() . 'log/upgrade.' . date('Ymd') . '.log.php'; - if(!file_exists($logFile)) file_put_contents($logFile, "\n"); - $log = date('Y-m-d H:i:s') . ' ' . trim($log) . "\n"; - file_put_contents($logFile, $log, FILE_APPEND); + $log = date('Y-m-d H:i:s') . ' ' . trim($log) . "\n"; + if(!file_exists($logFile)) $log = "\n" . $log; + + static $fh; + if(empty($fh)) $fh = fopen($logFile, 'a'); + fwrite($fh, $log); } } From 7a5e06ba65d9261097a1b87c79892a5140853c94 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Wed, 23 Jan 2019 09:54:00 +0800 Subject: [PATCH 2/2] *Lang chane. --- module/custom/lang/en.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index b60ffa1fba..b82a96bed9 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -5,18 +5,18 @@ $lang->custom->set = 'Customize'; $lang->custom->restore = 'Reset to Default'; $lang->custom->key = 'Key'; $lang->custom->value = 'Value'; -$lang->custom->flow = 'Mode'; -$lang->custom->working = 'WorkStyle'; +$lang->custom->flow = 'Workflow'; +$lang->custom->working = 'Work Mode'; $lang->custom->select = 'Select Workflow'; -$lang->custom->branch = 'Multi Branch'; +$lang->custom->branch = 'Multi-Branch'; $lang->custom->owner = 'Owner'; $lang->custom->module = 'Module'; $lang->custom->section = 'Section'; $lang->custom->lang = 'Language'; $lang->custom->setPublic = 'Set Public'; $lang->custom->required = 'Required'; -$lang->custom->score = 'Score'; -$lang->custom->scoreReset = 'Reset Score'; +$lang->custom->score = 'Point'; +$lang->custom->scoreReset = 'Reset Point'; $lang->custom->object['story'] = 'Story'; $lang->custom->object['task'] = 'Task'; @@ -41,7 +41,7 @@ $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; $lang->custom->task->fields['reasonList'] = 'Close Reason'; $lang->custom->task->fields['statusList'] = 'Status'; -$lang->custom->task->fields['hours'] = 'Man-hours'; +$lang->custom->task->fields['hours'] = 'Effort'; $lang->custom->bug = new stdClass(); $lang->custom->bug->fields['priList'] = 'Priority'; @@ -51,12 +51,12 @@ $lang->custom->bug->fields['browserList'] = 'Browser'; $lang->custom->bug->fields['typeList'] = 'Type'; $lang->custom->bug->fields['resolutionList'] = 'Solution'; $lang->custom->bug->fields['statusList'] = 'Status'; -$lang->custom->bug->fields['longlife'] = 'Shelved Days'; +$lang->custom->bug->fields['longlife'] = 'Longlife days'; $lang->custom->testcase = new stdClass(); $lang->custom->testcase->fields['priList'] = 'Priority'; $lang->custom->testcase->fields['typeList'] = 'Type'; -$lang->custom->testcase->fields['stageList'] = 'Phase'; +$lang->custom->testcase->fields['stageList'] = 'Stage'; $lang->custom->testcase->fields['resultList'] = 'Result'; $lang->custom->testcase->fields['statusList'] = 'Status'; $lang->custom->testcase->fields['review'] = 'Review Required'; @@ -73,7 +73,7 @@ $lang->custom->todo->fields['statusList'] = 'Status'; $lang->custom->user = new stdClass(); $lang->custom->user->fields['roleList'] = 'Role'; $lang->custom->user->fields['statusList'] = 'Status'; -$lang->custom->user->fields['deleted'] = 'Show deleted user'; +$lang->custom->user->fields['deleted'] = 'Deleted User'; $lang->custom->block->fields['closed'] = 'Closed Block'; @@ -83,12 +83,12 @@ $lang->custom->allLang = 'All Language'; $lang->custom->confirmRestore = 'Do you want to reset to Default?'; $lang->custom->notice = new stdclass(); -$lang->custom->notice->canNotAdd = 'These items are parameters of calculation, so customized creation is not enabled.'; +$lang->custom->notice->canNotAdd = 'It will be calculated, so customization is not enabled.'; $lang->custom->notice->forceReview = '%s Review is required for certain submitters.'; $lang->custom->notice->forceNotReview = "%s Review is NOT required for certain submitters."; -$lang->custom->notice->longlife = 'Define shelved bugs.'; -$lang->custom->notice->invalidNumberKey = 'Priority list key should be a natural and not greater than 255.'; -$lang->custom->notice->invalidStringKey = 'The key should be a combination of lowercase English letters, numbers or underscores'; +$lang->custom->notice->longlife = 'Define longlife bugs.'; +$lang->custom->notice->invalidNumberKey = 'The key should be =< 255.'; +$lang->custom->notice->invalidStringKey = 'The key should be a combination of lowercase letters, numbers or underlines.'; $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Homepage. Do you want to go to Product Homepage?"; $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Homepage. Do you want to go to Project Homepage?"; @@ -118,7 +118,7 @@ $lang->custom->productProject->relation['0_0'] = 'Product - Project'; $lang->custom->productProject->relation['0_1'] = 'Product - Sprint'; $lang->custom->productProject->relation['1_1'] = 'Project - Sprint'; -$lang->custom->productProject->notice = 'Please select according to your team.'; +$lang->custom->productProject->notice = 'Select according to your team'; $lang->custom->workingList['full'] = 'Application Lifecycle Management'; $lang->custom->workingList['onlyTest'] = 'Test Management';