From 4f1223ca73e2523982ae0ba86e1d9ab11182f352 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Sun, 5 May 2019 10:54:13 +0800 Subject: [PATCH 1/5] * adjust for printAction and fix error. --- module/action/model.php | 25 +++++++++++--------- module/user/view/ajaxprinttemplates.html.php | 4 ++-- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index 85bf65ea18..d408a42106 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -492,7 +492,7 @@ class actionModel extends model * @access public * @return void */ - public function printAction($action) + public function printAction($action, $desc = '') { if(!isset($action->objectType) or !isset($action->action)) return false; @@ -506,17 +506,20 @@ class actionModel extends model * 2. If no defined in the module language, search the common action define. * 3. If not found in the lang->action->desc, use the $lang->action->desc->common or $lang->action->desc->extra as the default. */ - if(isset($this->lang->$objectType) && isset($this->lang->$objectType->action->$actionType)) + if(empty($desc)) { - $desc = $this->lang->$objectType->action->$actionType; - } - elseif(isset($this->lang->action->desc->$actionType)) - { - $desc = $this->lang->action->desc->$actionType; - } - else - { - $desc = $action->extra ? $this->lang->action->desc->extra : $this->lang->action->desc->common; + if(isset($this->lang->$objectType) && isset($this->lang->$objectType->action->$actionType)) + { + $desc = $this->lang->$objectType->action->$actionType; + } + elseif(isset($this->lang->action->desc->$actionType)) + { + $desc = $this->lang->action->desc->$actionType; + } + else + { + $desc = $action->extra ? $this->lang->action->desc->extra : $this->lang->action->desc->common; + } } if($this->app->getViewType() == 'mhtml') $action->date = date('m-d H:i', strtotime($action->date)); diff --git a/module/user/view/ajaxprinttemplates.html.php b/module/user/view/ajaxprinttemplates.html.php index c4787df6db..33eba63bea 100644 --- a/module/user/view/ajaxprinttemplates.html.php +++ b/module/user/view/ajaxprinttemplates.html.php @@ -4,7 +4,7 @@ foreach($templates as $key => $template) { echo "
  • "; echo ""; - if($template->public) echo "{$lang->user->public} "; + if($template->public) echo "{$lang->public} "; echo $template->title . ""; if(empty($template->public) or $template->account == $app->user->account)echo ""; echo ""; @@ -33,7 +33,7 @@ foreach($templates as $key => $template) { echo "
  • "; echo ""; - if($template->public) echo "{$lang->user->public} "; + if($template->public) echo "{$lang->public} "; echo $template->title . ""; if(empty($template->public) or $template->account == $app->user->account)echo ""; echo ""; From 17cefd317703ef98292278d772401efd3358cfce Mon Sep 17 00:00:00 2001 From: reneeteng Date: Sun, 5 May 2019 15:19:37 +0800 Subject: [PATCH 2/5] * Lang changed. --- module/action/lang/en.php | 58 +++++++++++++++++------------------ module/block/lang/en.php | 4 +-- module/bug/lang/en.php | 48 ++++++++++++++--------------- module/build/lang/en.php | 4 +-- module/release/lang/en.php | 4 +-- module/report/lang/en.php | 2 +- module/score/lang/en.php | 2 +- module/testreport/lang/en.php | 14 ++++----- 8 files changed, 68 insertions(+), 68 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 85eab81095..b1128bbb1e 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -32,7 +32,7 @@ $lang->action->trashTips = 'Note: Delete in ZenTao is logic.'; $lang->action->textDiff = 'Text Format'; $lang->action->original = 'Original Format'; $lang->action->confirmHideAll = 'Do you want to hide all the records?'; -$lang->action->needEdit = '%s that you want to restore exists. Please edit it.'; +$lang->action->needEdit = '%s that you want to restore. Please edit it.'; $lang->action->historyEdit = 'The history EditBy cannot be empty.'; $lang->action->noDynamic = 'No dynamics. '; @@ -41,7 +41,7 @@ $lang->action->history->action = 'Link'; $lang->action->history->field = 'Field'; $lang->action->history->old = 'Old value'; $lang->action->history->new = 'New value'; -$lang->action->history->diff = 'Diff'; +$lang->action->history->diff = 'Compare'; $lang->action->dynamic = new stdclass(); $lang->action->dynamic->today = 'Today'; @@ -77,7 +77,7 @@ $lang->action->objectTypes['stepresult'] = 'Case Steps'; $lang->action->objectTypes['testtask'] = 'Test Build'; $lang->action->objectTypes['user'] = 'User'; $lang->action->objectTypes['doc'] = 'Doc'; -$lang->action->objectTypes['doclib'] = 'Doc Lib'; +$lang->action->objectTypes['doclib'] = 'Doc Library'; $lang->action->objectTypes['todo'] = 'Todo'; $lang->action->objectTypes['branch'] = 'Branch'; $lang->action->objectTypes['module'] = 'Module'; @@ -150,34 +150,34 @@ $lang->action->label->hidden = 'hid '; $lang->action->label->commented = 'commented '; $lang->action->label->activated = 'activated '; $lang->action->label->blocked = 'blocked '; -$lang->action->label->resolved = 'resolved '; +$lang->action->label->resolved = 'solved '; $lang->action->label->reviewed = 'reviewed '; $lang->action->label->moved = 'moved '; -$lang->action->label->confirmed = 'Confirmed Story'; -$lang->action->label->bugconfirmed = 'Confirmed'; -$lang->action->label->tostory = 'Convert to Story'; +$lang->action->label->confirmed = 'confirmed Story'; +$lang->action->label->bugconfirmed = 'confirmed'; +$lang->action->label->tostory = 'converted to Story'; $lang->action->label->frombug = 'Converted from Bug'; -$lang->action->label->fromlib = 'Import from library'; -$lang->action->label->totask = 'Convert to Task'; -$lang->action->label->svncommited = 'SVN Commit'; -$lang->action->label->gitcommited = 'Git Commit'; -$lang->action->label->linked2plan = 'Link to Plan'; -$lang->action->label->unlinkedfromplan = 'Unlink'; -$lang->action->label->changestatus = 'Change Status'; +$lang->action->label->fromlib = 'imported from Library'; +$lang->action->label->totask = 'converted to Task'; +$lang->action->label->svncommited = 'SVN committed'; +$lang->action->label->gitcommited = 'Git committed'; +$lang->action->label->linked2plan = 'linked to Plan'; +$lang->action->label->unlinkedfromplan = 'unlinked from'; +$lang->action->label->changestatus = 'changed Status'; $lang->action->label->marked = 'marked'; $lang->action->label->linked2project = "Link {$lang->projectCommon}"; $lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}"; -$lang->action->label->unlinkedfrombuild = "Unlink Build"; -$lang->action->label->linked2release = "Link Release"; -$lang->action->label->unlinkedfromrelease = "Unlink Release"; -$lang->action->label->linkrelatedbug = "Linked Bug"; -$lang->action->label->unlinkrelatedbug = "Unlinked Bug"; -$lang->action->label->linkrelatedcase = "Linked Case"; -$lang->action->label->unlinkrelatedcase = "Unlinked Case"; -$lang->action->label->linkrelatedstory = "Linked Story"; -$lang->action->label->unlinkrelatedstory = "Unlinked Story"; -$lang->action->label->subdividestory = "Decomposed Story"; -$lang->action->label->unlinkchildstory = "Unlinked Story"; +$lang->action->label->unlinkedfrombuild = "unlink Build"; +$lang->action->label->linked2release = "link Release"; +$lang->action->label->unlinkedfromrelease = "unlink Release"; +$lang->action->label->linkrelatedbug = "linked Bug"; +$lang->action->label->unlinkrelatedbug = "unlinked Bug"; +$lang->action->label->linkrelatedcase = "linked Case"; +$lang->action->label->unlinkrelatedcase = "unlinked Case"; +$lang->action->label->linkrelatedstory = "linked Story"; +$lang->action->label->unlinkrelatedstory = "unlinked Story"; +$lang->action->label->subdividestory = "decomposed Story"; +$lang->action->label->unlinkchildstory = "unlinked Story"; $lang->action->label->started = 'started '; $lang->action->label->restarted = 'continued '; $lang->action->label->recordestimate = 'recorded '; @@ -188,8 +188,8 @@ $lang->action->label->paused = 'paused '; $lang->action->label->verified = 'verified '; $lang->action->label->delayed = 'delayed '; $lang->action->label->suspended = 'suspended '; -$lang->action->label->login = 'Login'; -$lang->action->label->logout = "Logout"; +$lang->action->label->login = 'log in'; +$lang->action->label->logout = "log out"; $lang->action->label->deleteestimate = "deleted "; $lang->action->label->linked2build = "linked "; $lang->action->label->linked2bug = "linked "; @@ -204,11 +204,11 @@ $lang->action->label->task = 'Task|task|view|taskID=%s'; $lang->action->label->build = 'Build|build|view|buildID=%s'; $lang->action->label->bug = 'Bug|bug|view|bugID=%s'; $lang->action->label->case = 'Case|testcase|view|caseID=%s'; -$lang->action->label->testtask = 'Test Task|testtask|view|caseID=%s'; +$lang->action->label->testtask = 'Test|testtask|view|caseID=%s'; $lang->action->label->testsuite = 'Test Suite|testsuite|view|suiteID=%s'; $lang->action->label->caselib = 'Case Library|testsuite|libview|libID=%s'; $lang->action->label->todo = 'Todo|todo|view|todoID=%s'; -$lang->action->label->doclib = 'Doc Lib|doc|browse|libID=%s'; +$lang->action->label->doclib = 'Doc Library|doc|browse|libID=%s'; $lang->action->label->doc = 'Doc|doc|view|docID=%s'; $lang->action->label->user = 'User|user|view|account=%s'; $lang->action->label->testreport = 'Report|testreport|view|report=%s'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 4beb028f83..3cffb60a0a 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -340,7 +340,7 @@ $lang->block->typeList->task['canceledBy'] = 'Cancelled by Me'; $lang->block->typeList->bug['assignedTo'] = 'Assigned to Me'; $lang->block->typeList->bug['openedBy'] = 'Created by Me'; -$lang->block->typeList->bug['resolvedBy'] = 'Resolved by Me'; +$lang->block->typeList->bug['resolvedBy'] = 'Solved by Me'; $lang->block->typeList->bug['closedBy'] = 'Closed by Me'; $lang->block->typeList->case['assigntome'] = 'Assigned to Me'; @@ -396,7 +396,7 @@ $lang->block->gridOptions[8] = 'Left'; $lang->block->gridOptions[4] = 'Right'; $lang->block->flowchart = array(); -$lang->block->flowchart[] = array('Administlrator', 'Add Department', 'Add User', 'Maintain Privileges'); +$lang->block->flowchart[] = array('Administrator', 'Add Department', 'Add User', 'Maintain Privileges'); $lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases'); $lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks'); $lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs'); diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 8e2f490b55..169e0cddbc 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -45,18 +45,18 @@ $lang->bug->assignedTo = 'To'; $lang->bug->assignBug = 'Assignee'; $lang->bug->assignedToAB = 'To'; $lang->bug->assignedDate = 'Assigned'; -$lang->bug->resolvedBy = 'Resolved'; -$lang->bug->resolvedByAB = 'Resolved'; -$lang->bug->resolution = 'Resolution'; -$lang->bug->resolutionAB = 'Resolution'; -$lang->bug->resolvedBuild = 'Resolved Build'; -$lang->bug->resolvedDate = 'Resolved'; -$lang->bug->resolvedDateAB = 'Resolved'; +$lang->bug->resolvedBy = 'Solved'; +$lang->bug->resolvedByAB = 'Solved'; +$lang->bug->resolution = 'Solution'; +$lang->bug->resolutionAB = 'Solution'; +$lang->bug->resolvedBuild = 'Solved Build'; +$lang->bug->resolvedDate = 'Solved'; +$lang->bug->resolvedDateAB = 'Solved'; $lang->bug->deadline = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Closed By'; $lang->bug->closedDate = 'Closed'; -$lang->bug->duplicateBug = 'Duplicate Bug ID'; +$lang->bug->duplicateBug = 'Duplicated Bug ID'; $lang->bug->lastEditedBy = 'Edited By'; $lang->bug->linkBug = 'Linked Bug'; $lang->bug->linkBugs = 'Link Bug'; @@ -86,8 +86,8 @@ $lang->bug->assignTo = 'Assign'; $lang->bug->batchAssignTo = 'Batch Assign'; $lang->bug->browse = 'Bugs'; $lang->bug->view = 'Bug Details'; -$lang->bug->resolve = 'Resolve'; -$lang->bug->batchResolve = 'Batch Resolve'; +$lang->bug->resolve = 'Solve'; +$lang->bug->batchResolve = 'Batch Solve'; $lang->bug->close = 'Close'; $lang->bug->activate = 'Activate'; $lang->bug->batchActivate = 'Batch Activate'; @@ -102,10 +102,10 @@ $lang->bug->search = 'Search'; /* 查询条件列表。*/ $lang->bug->assignToMe = 'AssignToMe'; $lang->bug->openedByMe = 'CreateByMe'; -$lang->bug->resolvedByMe = 'ResolveByMe'; +$lang->bug->resolvedByMe = 'SolveByMe'; $lang->bug->closedByMe = 'ClosedByMe'; $lang->bug->assignToNull = 'Unassigned'; -$lang->bug->unResolved = 'Unresolved'; +$lang->bug->unResolved = 'Unsolved'; $lang->bug->toClosed = 'Unclosed'; $lang->bug->unclosed = 'Active'; $lang->bug->unconfirmed = 'UnConfirm'; @@ -117,13 +117,13 @@ $lang->bug->byQuery = 'Search'; $lang->bug->needConfirm = 'Story Changed'; $lang->bug->allProduct = 'All' . $lang->productCommon; $lang->bug->my = 'My'; -$lang->bug->yesterdayResolved = 'Bug Resolved Yesterday '; +$lang->bug->yesterdayResolved = 'Bug Solved Yesterday '; $lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday '; $lang->bug->yesterdayClosed = 'Bug Closed Yesterday '; $lang->bug->assignToMeAB = 'AssignToMe'; $lang->bug->openedByMeAB = 'CreateByMe'; -$lang->bug->resolvedByMeAB = 'ResolveByMe'; +$lang->bug->resolvedByMeAB = 'SolveByMe'; $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; @@ -136,7 +136,7 @@ $lang->bug->delayWarning = " Delay %s days bug->lblAssignedTo = 'Assignee'; $lang->bug->lblMailto = 'Mail To'; $lang->bug->lblLastEdited = 'Last Edited'; -$lang->bug->lblResolved = 'Resolved By'; +$lang->bug->lblResolved = 'Solved By'; $lang->bug->allUsers = 'All Users'; $lang->bug->allBuilds = 'All'; $lang->bug->createBuild = 'New'; @@ -157,11 +157,11 @@ $lang->bug->legendRelated = 'Related Info'; $lang->bug->buttonConfirm = 'Confirm'; /* 交互提示。*/ -$lang->bug->summary = "Bugs on this page : %s Total, %s Unresolved."; +$lang->bug->summary = "Bugs on this page : %s Total, %s Unsolved."; $lang->bug->confirmChangeProduct = "Any change to {$lang->productCommon} will cause linked {$lang->projectCommon}, Story and Task change. Do you want to do this?"; $lang->bug->confirmDelete = 'Do you want to delete this bug?'; $lang->bug->remindTask = 'This Bug has been converted to Task. Do you want to update Status of Task(ID %s)?'; -$lang->bug->skipClose = 'Bug %s is not resolved. You cannot close it.'; +$lang->bug->skipClose = 'Bug %s is not solved. You cannot close it.'; /* 模板。*/ $lang->bug->tplStep = "

    [Steps]


    "; @@ -242,7 +242,7 @@ $lang->bug->typeList['trackthings'] = 'Tracking'; $lang->bug->statusList[''] = ''; $lang->bug->statusList['active'] = 'Active'; -$lang->bug->statusList['resolved'] = 'Resolved'; +$lang->bug->statusList['resolved'] = 'Solved'; $lang->bug->statusList['closed'] = 'Closed'; $lang->bug->confirmedList[1] = 'Confirmed'; @@ -252,7 +252,7 @@ $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'As Design'; $lang->bug->resolutionList['duplicate'] = 'Duplicated Bug'; $lang->bug->resolutionList['external'] = 'External Cause'; -$lang->bug->resolutionList['fixed'] = 'Resolved'; +$lang->bug->resolutionList['fixed'] = 'Solved'; $lang->bug->resolutionList['notrepro'] = 'Irreproducible'; $lang->bug->resolutionList['postponed'] = 'Postpone'; $lang->bug->resolutionList['willnotfix'] = "Ignore"; @@ -268,13 +268,13 @@ $lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . ' B $lang->bug->report->charts['bugsPerBuild'] = 'Bugs Per Build'; $lang->bug->report->charts['bugsPerModule'] = 'Bugs Per Module'; $lang->bug->report->charts['openedBugsPerDay'] = 'Reported Bugs Per Day'; -$lang->bug->report->charts['resolvedBugsPerDay'] = 'Resolved Bugs Per Day'; +$lang->bug->report->charts['resolvedBugsPerDay'] = 'Solved Bugs Per Day'; $lang->bug->report->charts['closedBugsPerDay'] = 'Closed Bugs Per Day'; $lang->bug->report->charts['openedBugsPerUser'] = 'Reported Bugs Per User'; -$lang->bug->report->charts['resolvedBugsPerUser'] = 'Resolved Bugs Per User'; +$lang->bug->report->charts['resolvedBugsPerUser'] = 'Solved Bugs Per User'; $lang->bug->report->charts['closedBugsPerUser'] = 'Closed Bugs Per User'; $lang->bug->report->charts['bugsPerSeverity'] = 'Bug Severity Report'; -$lang->bug->report->charts['bugsPerResolution'] = 'Bug Resolution Report'; +$lang->bug->report->charts['bugsPerResolution'] = 'Bug Solution Report'; $lang->bug->report->charts['bugsPerStatus'] = 'Bug Status Report'; $lang->bug->report->charts['bugsPerActivatedCount'] = 'Bug Activation Report'; $lang->bug->report->charts['bugsPerPri'] = 'Bug Priority Report'; @@ -345,7 +345,7 @@ $lang->bug->report->resolvedBugsPerUser->graph->xAxisName = 'User'; $lang->bug->report->closedBugsPerUser->graph->xAxisName = 'User'; $lang->bug->report->bugsPerSeverity->graph->xAxisName = 'Priority'; -$lang->bug->report->bugsPerResolution->graph->xAxisName = 'Resolution'; +$lang->bug->report->bugsPerResolution->graph->xAxisName = 'Solution'; $lang->bug->report->bugsPerStatus->graph->xAxisName = 'Status'; $lang->bug->report->bugsPerActivatedCount->graph->xAxisName = 'Activated Count'; $lang->bug->report->bugsPerPri->graph->xAxisName = 'Priority'; @@ -356,7 +356,7 @@ $lang->bug->report->bugHistories->graph->xAxisName = 'Handling Steps'; /* 操作记录。*/ $lang->bug->action = new stdclass(); -$lang->bug->action->resolved = array('main' => '$date, resolved by $actor and the solution is $extra $appendLink.', 'extra' => 'resolutionList'); +$lang->bug->action->resolved = array('main' => '$date, solved by $actor and the solution is $extra $appendLink.', 'extra' => 'resolutionList'); $lang->bug->action->tostory = array('main' => '$date, converted by $actor to Story with ID $extra.'); $lang->bug->action->totask = array('main' => '$date, imported by $actor as Task with ID $extra.'); $lang->bug->action->linked2plan = array('main' => '$date, linked by $actor to Plan $extra.'); diff --git a/module/build/lang/en.php b/module/build/lang/en.php index e1c69b160d..a2683a0d7c 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -43,13 +43,13 @@ $lang->build->packageType = 'Package Type'; $lang->build->unlinkStory = 'Unlink Story'; $lang->build->unlinkBug = 'Unlink Bug'; $lang->build->stories = 'Finished Story'; -$lang->build->bugs = 'Resolved Bug'; +$lang->build->bugs = 'Solved Bug'; $lang->build->generatedBugs = 'Reported Bug'; $lang->build->noProduct = " This {$lang->projectCommon} is not linked to {$lang->productCommon}, so the Build cannot be created. Please first link {$lang->productCommon}"; $lang->build->noBuild = 'No builds. '; $lang->build->finishStories = ' %s Story is finished.'; -$lang->build->resolvedBugs = ' %s Bug is resolved.'; +$lang->build->resolvedBugs = ' %s Bug is solved.'; $lang->build->createdBugs = ' %s Bug is created.'; $lang->build->placeholder = new stdclass(); diff --git a/module/release/lang/en.php b/module/release/lang/en.php index e6ae7747f6..b5d4c29a7a 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -48,7 +48,7 @@ $lang->release->bugs = 'Resolved Bug'; $lang->release->leftBugs = 'Remained Bug'; $lang->release->generatedBugs = 'Remained Bug'; $lang->release->finishStories = 'Finished %s Story'; -$lang->release->resolvedBugs = 'Resolved %s Bug'; +$lang->release->resolvedBugs = 'Solved %s Bug'; $lang->release->createdBugs = 'Generated %s Bug'; $lang->release->export = 'Export as HTML'; $lang->release->yesterday = 'Released Yesterday'; @@ -59,7 +59,7 @@ $lang->release->scmPath = 'SCM Path : '; $lang->release->exportTypeList['all'] = 'All'; $lang->release->exportTypeList['story'] = 'Story'; $lang->release->exportTypeList['bug'] = 'Bug'; -$lang->release->exportTypeList['leftbug'] = 'Unresolved Bug'; +$lang->release->exportTypeList['leftbug'] = 'Unsolved Bug'; $lang->release->statusList[''] = ''; $lang->release->statusList['normal'] = 'Normal'; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index 79b6ea9105..713130073b 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -69,7 +69,7 @@ $lang->report->to = 'to'; $lang->report->taskTotal = "Total Task"; $lang->report->manhourTotal = "Total Man-hour"; $lang->report->validRate = "Valid Rate"; -$lang->report->validRateTips = "Solution is fixed/postponed or status is resolved/closed."; +$lang->report->validRateTips = "Solution is fixed/postponed or status is Solved/Closed."; $lang->report->unplanned = 'Unplanned'; $lang->report->workday = 'Man-hour/Day'; $lang->report->diffDays = 'Man-Day'; diff --git a/module/score/lang/en.php b/module/score/lang/en.php index adac320935..5e705c1158 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -67,7 +67,7 @@ $lang->score->methods['story']['close'] = 'Close Story'; $lang->score->methods['bug']['create'] = 'Create Bug'; $lang->score->methods['bug']['confirmBug'] = 'Confirm Bug'; $lang->score->methods['bug']['createFormCase'] = 'Create Bug form Case'; -$lang->score->methods['bug']['resolve'] = 'Resolve Bug'; +$lang->score->methods['bug']['resolve'] = 'Solve Bug'; $lang->score->methods['bug']['saveTplModal'] = 'Save Template'; $lang->score->methods['testtask']['runCase'] = 'Run Test Case'; $lang->score->methods['testcase']['create'] = 'Create Test Case'; diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index 580d63034c..2c2332e5f9 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -47,12 +47,12 @@ $lang->testreport->legendMore = 'More'; $lang->testreport->bugSeverityGroups = 'Bug Severity Distribution'; $lang->testreport->bugTypeGroups = 'Bug Type Distribution'; $lang->testreport->bugStatusGroups = 'Bug Status Distribution'; -$lang->testreport->bugOpenedByGroups = 'Bug ReportBy Distribution'; -$lang->testreport->bugResolvedByGroups = 'Bug ResolveBy Distribution'; -$lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution'; +$lang->testreport->bugOpenedByGroups = 'Bug ReportedBy Distribution'; +$lang->testreport->bugResolvedByGroups = 'Bug SolvedBy Distribution'; +$lang->testreport->bugResolutionGroups = 'Bug Solution Distribution'; $lang->testreport->bugModuleGroups = 'Bug Module Distribution'; $lang->testreport->legacyBugs = 'Legacy Bugs'; -$lang->testreport->bugConfirmedRate = 'Confirmed Bug Rate (Resolution is fixed or postponed / status is resolved or closed)'; +$lang->testreport->bugConfirmedRate = 'Confirmed Bug Rate (Solution is fixed or postponed / status is solved or closed)'; $lang->testreport->bugCreateByCaseRate = 'Bug Generated in Case Rate (Bugs reported in cases / Newly added bugs)'; $lang->testreport->caseSummary = ' %s cases in Total : %s performed, %s results, %s failed.'; @@ -62,14 +62,14 @@ $lang->testreport->moreNotice = 'More features can be extended with referenc $lang->testreport->exportNotice = "Exported By ZenTao"; $lang->testreport->noReport = "No report has been generated. Please check it later."; $lang->testreport->foundBugTip = "Bugs generated in this build and generated in the test period."; -$lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period."; +$lang->testreport->legacyBugTip = "Active bugs, or the solved bugs that is not in the test period."; $lang->testreport->fromCaseBugTip = "Bugs generated due to the failed case executions in the test period."; $lang->testreport->errorTrunk = "You cannot create a Test report for the trunk. Please modify the linked build!"; $lang->testreport->moreProduct = "Test reports can only be generated for the same product."; $lang->testreport->bugSummary = <<%s Bug(s) reported in total , -%s Bug(s) remained unresolve , +%s Bug(s) remained unsolved , %s Bug(s) generated due to the failure of case executions . -Bug Effective Rate : %s，Bugs reported from case rate: %s +Bug Effective Rate : %s，Bugs reported from case rate: %s EOD; From 140984502c74d6c5a341f6a7c33047ad9fdff712 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Sun, 5 May 2019 16:40:22 +0800 Subject: [PATCH 3/5] * code for task #5428,5379. --- module/action/lang/zh-cn.php | 4 ++- module/action/model.php | 12 ++++++- module/task/model.php | 65 ++++++++++++++++++++++++------------ 3 files changed, 58 insertions(+), 23 deletions(-) diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 9fc58645a3..334e101a9f 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -130,10 +130,12 @@ $lang->action->desc->diff3 = '将文件名 %s 改为 %s 。' . "\n"; $lang->action->desc->linked2bug = '$date 由 $actor 关联到版本 $extra'; /* 子任务修改父任务的历史操作记录 */ - +$lang->action->desc->createchildren = '$date, 由 $actor 创建子任务 $extra。' . "\n"; +$lang->action->desc->linkchildtask = '$date, 由 $actor 关联子任务 $extra。' . "\n"; $lang->action->desc->linkchildtask = '$date, 由 $actor 关联子任务 $extra。' . "\n"; $lang->action->desc->unlinkchildrentask = '$date, 由 $actor 移除子任务 $extra。' . "\n"; $lang->action->desc->linkparenttask = '$date, 由 $actor 关联父任务 $extra。' . "\n"; +$lang->action->desc->unlinkparenttask = '$date, 由 $actor 取消关联父任务 $extra。' . "\n"; /* 关联用例和移除用例时的历史操作记录。*/ $lang->action->desc->linkrelatedcase = '$date, 由 $actor 关联相关用例 $extra。' . "\n"; diff --git a/module/action/model.php b/module/action/model.php index a11925f91a..57b53c5561 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -291,7 +291,17 @@ class actionModel extends model $title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title'); if($title) $action->extra = common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$action->extra"), "#$action->extra " . $title) : "#$action->extra " . $title; } - elseif($actionName == 'totask' or $actionName == 'linkchildtask' or $actionName == 'unlinkchildrentask' or $actionName == 'linkparenttask') + elseif($actionName == 'createchildren') + { + $names = $this->dao->select('id,name')->from(TABLE_TASK)->where('id')->in($action->extra)->fetchPairs('id', 'name'); + $action->extra = ''; + if($names) + { + foreach($names as $id => $name) $action->extra .= common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$id"), "#$id " . $name) . ', ' : "#$id " . $name . ', '; + } + $action->extra = trim(trim($action->extra), ','); + } + elseif($actionName == 'totask' or $actionName == 'linkchildtask' or $actionName == 'unlinkchildrentask' or $actionName == 'linkparenttask' or $actionName == 'unlinkparenttask') { $name = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($action->extra)->fetch('name'); if($name) $action->extra = common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$action->extra"), "#$action->extra " . $name) : "#$action->extra " . $name; diff --git a/module/task/model.php b/module/task/model.php index 5db36c26db..67ad5d7b71 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -302,7 +302,7 @@ class taskModel extends model if(dao::isError()) die(js::error(dao::getError())); $taskID = $this->dao->lastInsertID(); - $childTasks .= html::a(helper::createLink('task', 'view', 'taskID=' . $taskID), $task->name, '', "title='$task->name' class='text-ellipsis w-p10'") . ','; + $childTasks .= $taskID . ','; if($story) $this->story->setStage($task->story); $actionID = $this->action->create('task', $taskID, 'Opened', ''); if(!dao::isError()) $this->loadModel('score')->create('task', 'create', $taskID); @@ -318,7 +318,7 @@ class taskModel extends model $this->updateParentStatus($taskID); $this->computeBeginAndEnd($parentID); $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($parentID)->exec(); - $this->action->create('task', $parentID, 'batchCreate', $childTasks); + $this->action->create('task', $parentID, 'createChildren', '', trim($childTasks, ',')); } return $mails; } @@ -396,10 +396,10 @@ class taskModel extends model * @access public * @return bool */ - public function updateParentStatus($taskID) + public function updateParentStatus($taskID, $parentID = 0, $createAction = true) { $childTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch(); - $parentID = $childTask->parent; + if(empty($parentID)) $parentID = $childTask->parent; if(empty($parentID)) return true; $this->computeWorkingHours($parentID); @@ -441,6 +441,8 @@ class taskModel extends model $parentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($parentID)->fetch(); if($status and $parentTask->status != $status) { + if($status == 'wait' and $parentTask->status != 'wait') $status = 'doing'; + $now = helper::now(); $task = new stdclass(); $task->status = $status; @@ -491,6 +493,8 @@ class taskModel extends model $this->dao->update(TABLE_TASK)->data($task)->where('id')->eq($parentID)->exec(); if(!dao::isError()) { + if(!$createAction) return $task; + $changes = common::createChanges($parentTask, $task); $action = 'Canceled'; if($status == 'done') $action = 'Finished'; @@ -677,13 +681,6 @@ class taskModel extends model $this->dao->update(TABLE_TASK)->set('project')->eq($task->project)->set('module')->eq($task->module)->where('parent')->eq($taskID)->exec(); } - if(isset($task->parent) and $task->parent != $oldTask->parent) - { - $this->loadModel('action')->create('task', $task->parent, 'linkChildTask', '', $taskID); - $this->loadModel('action')->create('task', $oldTask->parent, 'unLinkChildrenTask', '', $taskID); - $this->loadModel('action')->create('task', $taskID, 'linkParentTask', '', $task->parent); - } - $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->edit['id'], $this->post->uid); $teams = array(); @@ -747,25 +744,51 @@ class taskModel extends model ->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty') ->where('id')->eq((int)$taskID)->exec(); - if($oldTask->parent > 0) - { - if($task->parent == 0) $this->computeWorkingHours($oldTask->parent); - $this->updateParentStatus($taskID, false); - $this->computeBeginAndEnd($oldTask->parent); - } - - if($this->post->story != false) $this->loadModel('story')->setStage($this->post->story); if(!dao::isError()) { + if($this->post->story != false) $this->loadModel('story')->setStage($this->post->story); if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID); if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID); - if(!empty($task->parent)) + + $this->loadModel('action'); + $changed = $task->parent != $oldTask->parent; + if($oldTask->parent > 0) { + $oldParentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($oldTask->parent)->fetch(); + if($task->parent == 0) $this->computeWorkingHours($oldTask->parent); + $this->updateParentStatus($taskID, $oldTask->parent, !$changed); + $this->computeBeginAndEnd($oldTask->parent); + + if($changed) + { + $this->action->create('task', $taskID, 'unlinkParentTask', '', $oldTask->parent); + $actionID = $this->action->create('task', $oldTask->parent, 'unLinkChildrenTask', '', $taskID); + $newParentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($oldTask->parent)->fetch(); + $changes = common::createChanges($oldParentTask, $newParentTask); + if(!empty($changes)) $this->action->logHistory($actionID, $changes); + } + } + + if($task->parent > 0) + { + $parentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($task->parent)->fetch(); $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($task->parent)->exec(); - $this->updateParentStatus($taskID); + $this->updateParentStatus($taskID, $task->parent, !$changed); $this->computeBeginAndEnd($task->parent); + + if($changed) + { + $this->action->create('task', $taskID, 'linkParentTask', '', $task->parent); + $actionID = $this->action->create('task', $task->parent, 'linkChildTask', '', $taskID); + $newParentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($task->parent)->fetch(); + $changes = common::createChanges($parentTask, $newParentTask); + if(!empty($changes)) $this->action->logHistory($actionID, $changes); + } } $this->file->updateObjectID($this->post->uid, $taskID, 'task'); + + unset($oldTask->parent); + unset($task->parent); return common::createChanges($oldTask, $task); } } From 0208e8a975498353c6ef74189f8bf0d2b5c3e968 Mon Sep 17 00:00:00 2001 From: reneeteng Date: Sun, 5 May 2019 16:42:11 +0800 Subject: [PATCH 4/5] * Lang changed. --- module/mail/lang/en.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php index 389b52d939..89c28f2e2f 100755 --- a/module/mail/lang/en.php +++ b/module/mail/lang/en.php @@ -75,13 +75,13 @@ $lang->mail->more = 'More'; $lang->mail->noticeResend = 'The Email has been re-sent!'; $lang->mail->inputFromEmail = 'Sender Email'; $lang->mail->nextStep = 'Next'; -$lang->mail->successSaved = 'Email settings is saved.'; +$lang->mail->successSaved = 'Email settings are saved.'; $lang->mail->testSubject = 'Testing Email'; -$lang->mail->testContent = 'Email settings is done!'; +$lang->mail->testContent = 'Email settings are done!'; $lang->mail->successSended = 'Sent!'; $lang->mail->confirmDelete = 'Do you want to delete it?'; $lang->mail->sendmailTips = 'Note: Email sender will not receive this email.'; -$lang->mail->needConfigure = 'Email settings is not found. Please do the Email settings first.'; +$lang->mail->needConfigure = 'Email settings are not found. Please do the Email settings first.'; $lang->mail->connectFail = 'Connection to ZenTao failed.'; $lang->mail->centifyFail = 'Verification failed. The secret key might be changed. Please try to bind again!'; $lang->mail->nofsocket = 'fsocket related functions are deactivated. so Emails cannot be sent out. Please modify allow_url_fopen in php.ini to turn on Onopenssl, and restart Apache.'; From 0936df0edc852beff107aef035378ea7799e08b4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Sun, 5 May 2019 17:52:54 +0800 Subject: [PATCH 5/5] * adjust for change parent status. --- module/doc/lang/zh-cn.php | 1 + module/story/lang/zh-cn.php | 1 + module/task/model.php | 14 ++++++++------ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 66a2675372..9304bfbf11 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -41,6 +41,7 @@ $lang->doc->extension = '类型'; $lang->doc->size = '大小'; $lang->doc->download = '下载'; $lang->doc->acl = '权限'; +$lang->doc->fileName = '附件'; $lang->doc->groups = '分组'; $lang->doc->users = '用户'; $lang->doc->item = '项'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index cc252b150a..817847c87a 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -68,6 +68,7 @@ $lang->story->hour = '小时'; $lang->story->status = '当前状态'; $lang->story->stage = '所处阶段'; $lang->story->stageAB = '阶段'; +$lang->story->stagedBy = '设置阶段者'; $lang->story->mailto = '抄送给'; $lang->story->openedBy = '由谁创建'; $lang->story->openedDate = '创建日期'; diff --git a/module/task/model.php b/module/task/model.php index 67ad5d7b71..7306559cc1 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -441,8 +441,6 @@ class taskModel extends model $parentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($parentID)->fetch(); if($status and $parentTask->status != $status) { - if($status == 'wait' and $parentTask->status != 'wait') $status = 'doing'; - $now = helper::now(); $task = new stdclass(); $task->status = $status; @@ -473,7 +471,7 @@ class taskModel extends model $task->closedReason = 'done'; } - if($status == 'doing') + if($status == 'doing' or $status == 'wait') { if($parentTask->assignedTo == 'closed') { @@ -496,15 +494,19 @@ class taskModel extends model if(!$createAction) return $task; $changes = common::createChanges($parentTask, $task); - $action = 'Canceled'; + $action = ''; if($status == 'done') $action = 'Finished'; if($status == 'closed') $action = 'Closed'; if($status == 'pause') $action = 'Paused'; + if($status == 'cancel') $action = 'Canceled'; if($status == 'doing' and $parentTask->status == 'wait') $action = 'Started'; if($status == 'doing' and $parentTask->status == 'pause') $action = 'Restarted'; if($status == 'doing' and $parentTask->status != 'wait' and $parentTask->status != 'pause') $action = 'Activated'; - $actionID = $this->loadModel('action')->create('task', $parentID, $action); - $this->action->logHistory($actionID, $changes); + if($action) + { + $actionID = $this->loadModel('action')->create('task', $parentID, $action); + $this->action->logHistory($actionID, $changes); + } } } }