From 370cc9122841463478e9e3390a054431109c19f1 Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 2 Jul 2018 10:50:46 +0800 Subject: [PATCH 1/7] * Finish task #4545. --- db/update10.0.sql | 1 + db/zentao.sql | 2 +- module/upgrade/model.php | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 db/update10.0.sql diff --git a/db/update10.0.sql b/db/update10.0.sql new file mode 100644 index 0000000000..3fe85f06c1 --- /dev/null +++ b/db/update10.0.sql @@ -0,0 +1 @@ +ALTER TABLE `zt_storyspec` CHANGE `title` `title` varchar(255) NOT NULL; diff --git a/db/zentao.sql b/db/zentao.sql index 67a35ca9f1..b0abac0d50 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -575,7 +575,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` ( CREATE TABLE IF NOT EXISTS `zt_storyspec` ( `story` mediumint(9) NOT NULL, `version` smallint(6) NOT NULL, - `title` varchar(90) NOT NULL, + `title` varchar(255) NOT NULL, `spec` text NOT NULL, `verify` text NOT NULL, UNIQUE KEY `story` (`story`,`version`) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index a2f4fd84c8..cb825bfca5 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -224,6 +224,9 @@ class upgradeModel extends model $this->fixProjectStatisticBlock(); case '10_0_beta': $this->execSQL($this->getUpgradeFile('10.0.beta')); + case '10_0': + $this->execSQL($this->getUpgradeFile('10.0')); + $this->fixStorySpecTitle(); } $this->deletePatch(); @@ -2331,4 +2334,29 @@ class upgradeModel extends model } return true; } + + /** + * Fix story spec title. + * + * @access public + * @return bool + */ + public function fixStorySpecTitle() + { + $stories = $this->dao->select('story')->from(TABLE_STORYSEPC)->groupBy('story')->having('COUNT(story, version) = 1'); + + $stories = $this->dao->select('t1.id, t1.title')->from(TABLE_STORY)->('t1') + ->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story') + ->where('t1.id')->in($stories) + ->andWhere('t1.title')->ne('t2.title') + ->andWhere('t2.version')->eq(1) + ->fetchPairs(); + + foreach($stories as $story => $title) + { + $this->dao->update(TABLE_STORYSPEC)->set('title')->eq($title)->where('story')->eq($story)->andWhere('version')->eq(1)->exec(); + } + + return !dao::isError(); + } } From c1e7de7815718d6c6a2bb04e0b1c78c7dcd930e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Mon, 2 Jul 2018 13:13:23 +0800 Subject: [PATCH 2/7] * Fix bug. --- module/upgrade/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index cb825bfca5..30cd05a221 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -2345,7 +2345,7 @@ class upgradeModel extends model { $stories = $this->dao->select('story')->from(TABLE_STORYSEPC)->groupBy('story')->having('COUNT(story, version) = 1'); - $stories = $this->dao->select('t1.id, t1.title')->from(TABLE_STORY)->('t1') + $stories = $this->dao->select('t1.id, t1.title')->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story') ->where('t1.id')->in($stories) ->andWhere('t1.title')->ne('t2.title') From 58704d5c48c8dbcc2fa5c730461934238a8dd672 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Mon, 2 Jul 2018 13:23:57 +0800 Subject: [PATCH 3/7] * Finish task #4616. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 739a489e89..c094b66480 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1422,7 +1422,7 @@ class taskModel extends model ->beginIF($type == 'delayed')->andWhere('t1.deadline')->gt('1970-1-1')->andWhere('t1.deadline')->lt(date(DT_DATE1))->andWhere('t1.status')->in('wait,doing')->fi() ->beginIF(is_array($type) or strpos(',all,undone,needconfirm,assignedtome,delayed,finishedbyme,myinvolved,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi() ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi() - ->orderBy('t1.`id`,' . $orderBy) + ->orderBy("t1.$orderBy") ->fetchAll('id'); if(!empty($children)) From a0044b641bb3bb914898d68915ce3915a0c68c0d Mon Sep 17 00:00:00 2001 From: reneteng Date: Mon, 2 Jul 2018 13:34:04 +0800 Subject: [PATCH 4/7] *chang for 10.0 --- module/action/lang/en.php | 62 +++++++++++++++++----------------- module/common/lang/en.php | 2 +- module/dept/lang/en.php | 2 +- module/productplan/lang/en.php | 2 +- module/release/lang/en.php | 2 +- module/tree/lang/en.php | 4 +-- module/user/lang/en.php | 6 ++-- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 3d2da45d74..b6a15f0205 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -135,24 +135,24 @@ $lang->action->desc->unlinkrelatedcase = '$date, $actor unlinke /* 用来显示动态信息。*/ $lang->action->label = new stdclass(); -$lang->action->label->created = 'Created'; -$lang->action->label->opened = 'Open'; -$lang->action->label->changed = 'Changed'; -$lang->action->label->edited = 'Edited'; -$lang->action->label->assigned = 'Assigned'; -$lang->action->label->closed = 'Closed'; -$lang->action->label->deleted = 'Deleted'; -$lang->action->label->deletedfile = 'Deleted'; -$lang->action->label->editfile = 'Edit'; -$lang->action->label->erased = 'Erased'; -$lang->action->label->undeleted = 'Restored'; -$lang->action->label->hidden = 'Hidden'; -$lang->action->label->commented = 'Commented'; -$lang->action->label->activated = 'Activated'; -$lang->action->label->blocked = 'Blocked'; -$lang->action->label->resolved = 'Resolved'; -$lang->action->label->reviewed = 'Reviewed'; -$lang->action->label->moved = 'Moved'; +$lang->action->label->created = 'Created '; +$lang->action->label->opened = 'Open '; +$lang->action->label->changed = 'Changed '; +$lang->action->label->edited = 'Edited '; +$lang->action->label->assigned = 'Assigned '; +$lang->action->label->closed = 'Closed '; +$lang->action->label->deleted = 'Deleted '; +$lang->action->label->deletedfile = 'Deleted '; +$lang->action->label->editfile = 'Edit '; +$lang->action->label->erased = 'Erased '; +$lang->action->label->undeleted = 'Restored '; +$lang->action->label->hidden = 'Hidden '; +$lang->action->label->commented = 'Commented '; +$lang->action->label->activated = 'Activated '; +$lang->action->label->blocked = 'Blocked '; +$lang->action->label->resolved = 'Resolved '; +$lang->action->label->reviewed = 'Reviewed '; +$lang->action->label->moved = 'Moved '; $lang->action->label->confirmed = 'Confirm Story'; $lang->action->label->bugconfirmed = 'Confirmed'; $lang->action->label->tostory = 'Convert to Story'; @@ -178,21 +178,21 @@ $lang->action->label->linkrelatedstory = "Link to Story"; $lang->action->label->unlinkrelatedstory = "Unlink"; $lang->action->label->subdividestory = "Decompose Story"; $lang->action->label->unlinkchildstory = "Unlink"; -$lang->action->label->started = 'Started'; -$lang->action->label->restarted = 'Continued'; -$lang->action->label->recordestimate = 'Recorded'; -$lang->action->label->editestimate = 'Edited'; -$lang->action->label->canceled = 'Cancelled'; -$lang->action->label->finished = 'Finished'; -$lang->action->label->paused = 'Paused'; -$lang->action->label->verified = 'Verified'; -$lang->action->label->delayed = 'Delayed'; -$lang->action->label->suspended = 'Suspended'; +$lang->action->label->started = 'Started '; +$lang->action->label->restarted = 'Continued '; +$lang->action->label->recordestimate = 'Recorded '; +$lang->action->label->editestimate = 'Edited '; +$lang->action->label->canceled = 'Cancelled '; +$lang->action->label->finished = 'Finished '; +$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->deleteestimate = "Deleted"; -$lang->action->label->linked2build = "Linked"; -$lang->action->label->linked2bug = "Linked"; +$lang->action->label->deleteestimate = "Deleted "; +$lang->action->label->linked2build = "Linked "; +$lang->action->label->linked2bug = "Linked "; /* 用来生成相应对象的链接。*/ $lang->action->label->product = $lang->productCommon . '|product|view|productID=%s'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 1d375e1afc..73be22bebe 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -65,7 +65,7 @@ $lang->reverse = 'Reverse'; $lang->switchDisplay = 'Toggle'; $lang->expand = 'Expand All'; $lang->collapse = 'Collapse'; -$lang->saveSuccess = 'Save success'; +$lang->saveSuccess = 'Saved'; $lang->fail = 'Fail'; $lang->addFiles = 'Add'; $lang->files = 'File '; diff --git a/module/dept/lang/en.php b/module/dept/lang/en.php index b35d0c2bb6..08ab92e35d 100644 --- a/module/dept/lang/en.php +++ b/module/dept/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->dept->common = 'Department'; -$lang->dept->manageChild = "Child Department"; +$lang->dept->manageChild = "Department"; $lang->dept->edit = "Edit"; $lang->dept->delete = "Delete"; $lang->dept->parent = "Parent"; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index f9e018646b..bbaa1a59d8 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -12,7 +12,7 @@ $lang->productplan->common = $lang->productCommon . ' Plan'; $lang->productplan->browse = "View"; $lang->productplan->index = "List"; -$lang->productplan->create = "Create"; +$lang->productplan->create = "Create Plan"; $lang->productplan->edit = "Edit"; $lang->productplan->delete = "Delete"; $lang->productplan->view = "Details"; diff --git a/module/release/lang/en.php b/module/release/lang/en.php index 46b5fa8f44..81f709f9eb 100644 --- a/module/release/lang/en.php +++ b/module/release/lang/en.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ $lang->release->common = 'Release'; -$lang->release->create = "Create"; +$lang->release->create = "Create Release"; $lang->release->edit = "Edit"; $lang->release->linkStory = "Link Story"; $lang->release->linkBug = "Link Bug"; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 9d2ae405e5..a45e23c197 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -19,7 +19,7 @@ $lang->tree->manage = 'Manage module'; $lang->tree->fix = 'Fix'; $lang->tree->manageProduct = "Manage {$lang->productCommon}"; $lang->tree->manageProject = "Manage {$lang->projectCommon}"; -$lang->tree->manageLine = 'Manage product line'; +$lang->tree->manageLine = 'Manage Product Line'; $lang->tree->manageBug = 'Manage Bug'; $lang->tree->manageCase = 'Manage Case'; $lang->tree->manageCaseLib = 'Manage Library'; @@ -27,7 +27,7 @@ $lang->tree->manageCustomDoc = 'Manage DocLib'; $lang->tree->updateOrder = 'Sort'; $lang->tree->manageChild = 'Manage Child Module'; $lang->tree->manageStoryChild = 'Manage Child Module'; -$lang->tree->manageLineChild = 'Manage product line'; +$lang->tree->manageLineChild = 'Manage Product Line'; $lang->tree->manageBugChild = 'Manage Child Bug'; $lang->tree->manageCaseChild = 'Manage Child Case'; $lang->tree->manageCaselibChild = 'Manage Child Library'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index bad80458c8..3640ff1b7b 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -100,8 +100,8 @@ $lang->user->weakPassword = "Your password does not meet the complexity requirem $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = 'Developer'; -$lang->user->roleList['qa'] = 'QA'; -$lang->user->roleList['pm'] = 'Project Manager'; +$lang->user->roleList['qa'] = 'Tester'; +$lang->user->roleList['pm'] = 'Scrum Master'; $lang->user->roleList['po'] = 'Product Owner'; $lang->user->roleList['td'] = 'Technical Manager'; $lang->user->roleList['pd'] = 'Product Manager'; @@ -160,7 +160,7 @@ $lang->user->contacts->manage = 'Manage'; $lang->user->contacts->contactsList = 'Contacts'; $lang->user->contacts->selectedUsers = 'Select'; $lang->user->contacts->selectList = 'List'; -$lang->user->contacts->createList = 'Create a Contact List'; +$lang->user->contacts->createList = 'Create Contact List'; $lang->user->contacts->noListYet = 'No contact list exists. Please create one first.'; $lang->user->contacts->confirmDelete = 'Do you want to delete this list?'; $lang->user->contacts->or = ' or '; From 6892137d996b96f248aa245cdbc3e6c3621ae137 Mon Sep 17 00:00:00 2001 From: daitingting Date: Mon, 2 Jul 2018 13:42:13 +0800 Subject: [PATCH 5/7] * Display menu that can link by bug. --- module/testtask/view/linkcase.html.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index 0e13024ad2..c028ce195c 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -25,6 +25,7 @@ echo "
"; $suitViewName = $type == 'bysuite'? $suiteList[$param]->name : $lang->testtask->linkBySuite; $suitActive = $type == 'bysuite' ? 'btn-active-text' : ''; + $bugActive = $type == 'bybug' ? 'btn-active-text' : ''; echo "{$suitViewName} "; echo "
    "; if($suiteList) @@ -60,6 +61,7 @@ } echo "
"; ?> + " . $lang->testtask->linkByBug . '', '', "class='btn btn-link {$bugActive}'");?> {$lang->testcase->bySearch}";?> From 06714837354ca1b2c33f808b5f3f7591579ff4e7 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Mon, 2 Jul 2018 14:00:07 +0800 Subject: [PATCH 6/7] * Finish task #4615. --- module/project/control.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/project/control.php b/module/project/control.php index e58a0a94cd..6894c34c91 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1002,6 +1002,8 @@ class project extends control $this->loadModel('action')->create('project', $projectID, 'opened'); $url = $this->createLink('project', 'create', "projectID=$projectID"); + + $planID = reset($this->post->plans); if(!empty($planID)) { die(js::confirm($this->lang->project->importPlanStory, $this->createLink('project', 'create', "projectID=$projectID©ProjectID=&planID=$planID"), $url, 'parent', 'parent')); From 7c33439d001281f6d674c6e6cbdabaee70e13dde Mon Sep 17 00:00:00 2001 From: daitingting Date: Mon, 2 Jul 2018 14:13:27 +0800 Subject: [PATCH 7/7] * Adjust plan link. --- module/project/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index b9fe8ca216..4d2e0650a2 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -189,7 +189,7 @@
$product):?> plan])):?> -
createLink('productplan', 'view', "planID={$product->id}"), $product->name . '/' . $planGroups[$productID][$product->plan]);?>
+
createLink('productplan', 'view', "planID={$product->plan}"), $product->name . '/' . $planGroups[$productID][$product->plan]);?>