-

story->batchCreate;?>

+

lang->story->subdivide : $this->lang->story->batchCreate;?>

createLink('file', 'uploadImages', 'module=story¶ms=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?> diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 28ab2624f5..22fbc9c6cc 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -66,6 +66,7 @@
story->legendBasicInfo;?>
+ parent <= 0):?> + - + + parent >= 0):?> + + + + + - + diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 0e26604693..3da0942c34 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -22,7 +22,10 @@
id?> - title;?> + + parent > 0) echo '' . $this->lang->story->childrenAB . '';?> + parent > 0) echo isset($story->parentName) ? html::a(inlink('view', "storyID={$story->parent}"), $story->parentName) . ' / ' : '';?>title;?> + version > 1):?> @@ -61,6 +64,55 @@
fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'true'));?> createLink('action', 'comment', "objectType=story&objectID=$story->id");?> + children)):?> +
+
lang->story->children;?>
+
+
story->product;?> @@ -76,8 +77,9 @@
story->module;?>story->module;?>
story->parent;?>parent, "class='form-control chosen'");?>
story->plan;?> @@ -153,7 +161,7 @@
story->estimate;?>estimate, "class='form-control'");?>parent >= 0 ? html::input('estimate', $story->estimate, "class='form-control'") : $story->estimate;?>
story->keywords;?>
+ + + + + + + + + + + + + children as $child):?> + + + + + + + + + + + +
story->id;?> priAB;?> story->title;?>story->assignedTo;?> story->estimate;?> story->status;?>actions;?>
id;?> + pri . "'>"; + echo $child->pri == '0' ? '' : zget($this->lang->story->priList, $child->pri, $child->pri); + echo ""; + ?> + id", '', true); ?>">title;?>assignedTo);?>estimate;?>processStatus('story', $child);?> + id", $child, 'list'); + common::printIcon('story', 'review', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('story', 'assignTo', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('story', 'close', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('story', 'activate', "storyID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('story', 'edit', "storyID=$child->id", $child, 'list'); + common::printIcon('story', 'createCase', "productID=$child->product&branch=$child->branch&module=0&from=¶m=0&story={$child->id}", $child, 'list', 'sitemap'); + ?> +
+
+
+
printExtendFields($story, 'div', "position=left&inForm=0&inCell=1");?>
@@ -72,18 +124,18 @@ id", $story, 'button', '', '', 'showinonlybody'); common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', '', '', 'showinonlybody'); - if($story->status != 'closed' and !isonlybody()) + if($story->status != 'closed' and $story->status != 'draft' and $story->parent <= 0 and !isonlybody()) { $misc = "class='btn' data-toggle='modal' data-type='iframe' data-width='95%'"; $link = $this->createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", '', true); - if(common::hasPriv('story', 'batchCreate')) echo html::a($link, " " . $lang->story->subdivide, '', $misc); + if(common::hasPriv('story', 'batchCreate')) echo html::a($link, " " . $lang->story->subdivide, '', $misc); } common::printIcon('story', 'assignTo', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); - if($config->global->flow != 'onlyStory' and !isonlybody() and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate'))) + if($config->global->flow != 'onlyStory' and !isonlybody() and $story->parent >= 0 and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate'))) { $this->app->loadLang('testcase'); echo "
"; diff --git a/module/task/control.php b/module/task/control.php index 778b746f31..bdef2e9af1 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -1393,7 +1393,7 @@ class task extends control $children = array(); foreach($tasks as $task) { - if(!empty($task->parent) and isset($tasks[$task->parent])) + if($task->parent > 0 and isset($tasks[$task->parent])) { $children[$task->parent][$task->id] = $task; unset($tasks[$task->id]); From 82fff1b42f1a0c0e470022f8a7a0baa23775f007 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 13 Mar 2020 10:00:43 +0800 Subject: [PATCH 3/8] * finish task #6981. --- module/story/control.php | 7 +++++++ module/story/lang/zh-cn.php | 1 + module/story/model.php | 2 +- module/story/view/view.html.php | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/module/story/control.php b/module/story/control.php index f30d4d7d32..8da91860a2 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -294,6 +294,13 @@ class story extends control */ public function batchCreate($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $project = 0, $plan = 0, $type = 'story') { + /* Check can subdivide or not. */ + if($storyID) + { + $story = $this->story->getById($storyID); + if($story->status != 'active' or $story->stage != 'wait' or $story->parent > 0) die(js::alert($this->lang->story->errorNotSubdivide)); + } + if(!empty($_POST)) { $mails = $this->story->batchCreate($productID, $branch, $type); diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 303c4af342..92a4648b37 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -216,6 +216,7 @@ $lang->story->needNotReview = '不需要评审'; $lang->story->successSaved = "{$lang->storyCommon}成功添加，"; $lang->story->confirmDelete = "您确认删除该{$lang->storyCommon}吗?"; $lang->story->errorEmptyChildStory = "『细分{$lang->storyCommon}』不能为空。"; +$lang->story->errorNotSubdivide = "状态不是激活，或者阶段不是未开始的{$lang->storyCommon}，或者是子需求，则不能细分。"; $lang->story->mustChooseResult = '必须选择评审结果'; $lang->story->mustChoosePreVersion = '必须选择回溯的版本'; $lang->story->noStory = "暂时没有{$lang->storyCommon}。"; diff --git a/module/story/model.php b/module/story/model.php index 9a2f16e0b3..8b298d99a6 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2616,7 +2616,7 @@ class storyModel extends model if($action == 'activate') return $story->status == 'closed'; if($action == 'assignto') return $story->status != 'closed'; if($action == 'batchcreate' and $story->parent > 0) return false; - if($action == 'batchcreate' and ($story->status == 'closed' or $story->status == 'draft' or $story->stage != 'wait')) return false; + if($action == 'batchcreate' and ($story->status != 'active' or $story->stage != 'wait')) return false; return true; } diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 5d2b079727..753b2d0098 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -124,12 +124,12 @@ id", $story, 'button', '', '', 'showinonlybody'); common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', '', '', 'showinonlybody'); - if($story->status != 'closed' and $story->status != 'draft' and $story->parent <= 0 and !isonlybody()) + if($story->status == 'active' and $story->stage == 'wait' and $story->parent <= 0 and !isonlybody()) { $divideLang = ($story->type == 'story' || !$story->type) ? $lang->story->subdivide : $lang->story->splitRequirent; $misc = "class='btn divideStory' data-toggle='modal' data-type='iframe' data-width='95%'"; $link = $this->createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", '', true); - if(common::hasPriv('story', 'batchCreate')) echo html::a($link, " " . $divideLang, '', $misc); + if(common::hasPriv('story', 'batchCreate')) echo html::a($link, " " . $divideLang, '', $misc); } common::printIcon('story', 'assignTo', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); From 4905c7aef65a20315bee3c70ec349013e5aae90d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 13 Mar 2020 10:01:02 +0800 Subject: [PATCH 4/8] * fix bug. --- db/standard/zentao12.1.sql | 1 + db/update12.0.1.sql | 2 ++ db/zentao.sql | 1 + 3 files changed, 4 insertions(+) diff --git a/db/standard/zentao12.1.sql b/db/standard/zentao12.1.sql index a7774fe61d..25461eec7b 100644 --- a/db/standard/zentao12.1.sql +++ b/db/standard/zentao12.1.sql @@ -638,6 +638,7 @@ CREATE TABLE IF NOT EXISTS `zt_repo` ( `acl` text NOT NULL, `synced` tinyint(1) NOT NULL DEFAULT '0', `lastSync` datetime NOT NULL, + `desc` text NOT NULL, `deleted` tinyint(1) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/db/update12.0.1.sql b/db/update12.0.1.sql index 47efed6a6e..698d6577ab 100644 --- a/db/update12.0.1.sql +++ b/db/update12.0.1.sql @@ -66,3 +66,5 @@ UPDATE `zt_webhook` SET `type` = 'wechatgroup' WHERE `type` = 'weixin'; UPDATE `zt_grouppriv` SET `method` = 'edit' WHERE `module` = 'repo' AND `method` = 'settings'; UPDATE `zt_grouppriv` SET `method` = 'showsynccommit' WHERE `module` = 'repo' AND `method` = 'showsynccomment'; UPDATE `zt_grouppriv` SET `method` = 'showsynccommit' WHERE `module` = 'repo' AND `method` = 'showSyncComment'; + +ALTER TABLE `zt_repo` ADD `desc` text NOT NULL AFTER `lastSync`; diff --git a/db/zentao.sql b/db/zentao.sql index 788f33a110..860c0a3dc5 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -641,6 +641,7 @@ CREATE TABLE IF NOT EXISTS `zt_repo` ( `acl` text NOT NULL, `synced` tinyint(1) NOT NULL DEFAULT '0', `lastSync` datetime NOT NULL, + `desc` text NOT NULL, `deleted` tinyint(1) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; From ce1716feacbbe3d7c1f79121a73332bec7d8cf8b Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Fri, 13 Mar 2020 10:09:02 +0800 Subject: [PATCH 5/8] * Code for requirement. --- db/update12.1.sql | 16 ++++++++++++++++ module/product/model.php | 2 +- module/product/view/browse.html.php | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/db/update12.1.sql b/db/update12.1.sql index db28bab230..c895677432 100644 --- a/db/update12.1.sql +++ b/db/update12.1.sql @@ -1 +1,17 @@ ALTER TABLE `zt_story` ADD `parent` mediumint NOT NULL DEFAULT '0' AFTER `id`; + +CREATE TABLE `zt_relation` ( + `id` int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY, + `program` mediumint(8) NOT NULL, + `product` mediumint(8) NOT NULL, + `project` mediumint(8) NOT NULL, + `AType` char(30) NOT NULL, + `AID` mediumint(8) NOT NULL, + `AVersion` char(30) NOT NULL, + `relation` char(30) NOT NULL, + `BType` char(30) NOT NULL, + `BID` mediumint(8) NOT NULL, + `BVersion` char(30) NOT NULL, + `extra` char(30) NOT NULL, + UNIQUE KEY `relation` (`relation`,`AType`,`BType`, `AID`, `BID`) +) ENGINE='MyISAM' DEFAULT CHARSET=utf8; diff --git a/module/product/model.php b/module/product/model.php index b457f4ede0..a8139a2964 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -584,7 +584,7 @@ class productModel extends model if($browseType == 'changedstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'changed', $type, $sort, $pager); if($browseType == 'willclose') $stories = $this->story->get2BeClosed($productID, $branch, $modules, $type, $sort, $pager); if($browseType == 'closedstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'closed', $type, $sort, $pager); - if($browseType == 'emptysr') $stories = $this->story->getEmptysr($productID, $branch, $modules, '', $type, $sort, $pager); + if($browseType == 'emptysr') $stories = $this->story->getEmptySR($productID, $branch, $modules, '', $type, $sort, $pager); return $stories; } diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 8b1899ceb7..ef1e82c97d 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -33,6 +33,7 @@ foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem) { if(isset($menuItem->hidden)) continue; + if($menuItem->name == 'emptysr' && $storyType == 'story') continue; $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name; if($menuItem->name == 'more') { From 3ba2f42aefe5f2cc3c30eb82208ead17eb4726a3 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 13 Mar 2020 11:22:54 +0800 Subject: [PATCH 6/8] * show child label. --- module/build/view/linkstory.html.php | 7 ++++++- module/build/view/view.html.php | 7 ++++++- module/productplan/view/linkstory.html.php | 7 ++++++- module/productplan/view/view.html.php | 7 ++++++- module/project/view/linkstory.html.php | 7 ++++++- module/project/view/story.html.php | 1 + module/release/view/linkstory.html.php | 7 ++++++- module/release/view/view.html.php | 7 ++++++- module/story/control.php | 4 ++-- module/story/model.php | 4 +++- module/testcase/control.php | 2 +- module/testcase/js/batchcreate.js | 2 +- 12 files changed, 50 insertions(+), 12 deletions(-) diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 192bd79da9..f55673e272 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -46,7 +46,12 @@ id => sprintf('%03d', $story->id)), ($story->stage == 'developed' or $story->status == 'closed') ? $story->id : '');?> story->priList, $story->pri, $story->pri)?> - createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> + + parent > 0) echo "{$lang->story->childrenAB}"; + echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'"); + ?> + openedBy);?> assignedTo);?> estimate;?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index c9cc0175e8..52163dc109 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -130,7 +130,12 @@ tbody tr td:first-child input{display:none;} story->priList, $story->pri, $story->pri);?> - title, '', "class='iframe' data-width='1000'");?> + + parent > 0) echo "{$lang->story->childrenAB}"; + echo html::a($storyLink,$story->title, '', "class='iframe' data-width='1000'"); + ?> + openedBy);?> estimate;?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 222a65849b..da8cd73dc9 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -50,7 +50,12 @@ pri;?>' title='story->priList, $story->pri, $story->pri)?>'>story->priList, $story->pri, $story->pri)?> planTitle;?> module];?> - createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> + + parent > 0) echo "{$lang->story->childrenAB}"; + echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'"); + ?> + openedBy);?> assignedTo);?> estimate;?> diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 266d99e53b..6f74b29c35 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -145,7 +145,12 @@ pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> module, '');?> - title);?> + + parent > 0) echo "{$lang->story->childrenAB}"; + echo html::a($viewLink , $story->title); + ?> + openedBy);?> assignedTo);?> estimate;?> diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php index e42f48b3e1..a060ff0157 100644 --- a/module/project/view/linkstory.html.php +++ b/module/project/view/linkstory.html.php @@ -64,7 +64,12 @@ pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> createLink('product', 'browse', "productID=$story->product&branch=$story->branch"), $products[$story->product]->name, '_blank');?> '>module, '')?> - title);?> + + parent > 0) echo "{$lang->story->childrenAB}"; + echo html::a($storyLink, $story->title); + ?> + planTitle;?> story->stageList, $story->stage);?> diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index bce2c41a31..8a15781079 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -158,6 +158,7 @@ pri?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> product][$story->branch])) echo "" . $branchGroups[$story->product][$story->branch] . '';?> + parent > 0) echo "{$lang->story->childrenAB}";?> title, null, "style='color: $story->color'");?> openedBy);?> diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php index f9d4b127c2..923f5fbdaf 100644 --- a/module/release/view/linkstory.html.php +++ b/module/release/view/linkstory.html.php @@ -50,7 +50,12 @@ id);?> pri;?>' title='story->priList, $story->pri)?>'>story->priList, $story->pri)?> - createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?> + + parent > 0) echo "{$lang->story->childrenAB}"; + echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'"); + ?> + openedBy);?> assignedTo);?> estimate;?> diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 8d24b32c67..d46696709e 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -105,7 +105,12 @@ id);?> pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> - title, '', "class='preview'");?> + + parent > 0) echo "{$lang->story->childrenAB}"; + echo html::a($storyLink,$story->title, '', "class='preview'"); + ?> + openedBy);?> estimate;?> diff --git a/module/story/control.php b/module/story/control.php index 8da91860a2..7400f88687 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1332,7 +1332,7 @@ class story extends control * @access public * @return void */ - public function ajaxGetProductStories($productID, $branch = 0, $moduleID = 0, $storyID = 0, $onlyOption = 'false', $status = '', $limit = 0, $type = 'full') + public function ajaxGetProductStories($productID, $branch = 0, $moduleID = 0, $storyID = 0, $onlyOption = 'false', $status = '', $limit = 0, $type = 'full', $hasParent = 1) { if($moduleID) { @@ -1348,7 +1348,7 @@ class story extends control $storyStatus = array_keys($storyStatus); } - $stories = $this->story->getProductStoryPairs($productID, $branch ? "0,$branch" : $branch, $moduleID, $storyStatus, 'id_desc', $limit, $type); + $stories = $this->story->getProductStoryPairs($productID, $branch ? "0,$branch" : $branch, $moduleID, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent); $select = html::select('story', empty($stories) ? array('' => '') : $stories, $storyID, "class='form-control'"); /* If only need options, remove select wrap. */ diff --git a/module/story/model.php b/module/story/model.php index 8b298d99a6..0109ec631b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1610,10 +1610,11 @@ class storyModel extends model * @param int $limit * @param string $type * @param string $storyType requirement|story + * @param bool $hasParent * @access public * @return array */ - public function getProductStoryPairs($productID = 0, $branch = 0, $moduleIdList = 0, $status = 'all', $order = 'id_desc', $limit = 0, $type = 'full', $storyType = 'story') + public function getProductStoryPairs($productID = 0, $branch = 0, $moduleIdList = 0, $status = 'all', $order = 'id_desc', $limit = 0, $type = 'full', $storyType = 'story', $hasParent = true) { if($branch) $branch = "0,$branch";//Fix bug 1059. $stories = $this->dao->select('t1.id, t1.title, t1.module, t1.pri, t1.estimate, t2.name AS product') @@ -1622,6 +1623,7 @@ class storyModel extends model ->beginIF($productID)->andWhere('t1.product')->in($productID)->fi() ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi() ->beginIF($branch)->andWhere('t1.branch')->in($branch)->fi() + ->beginIF(!$hasParent)->andWhere('t1.parent')->ge(0)->fi() ->beginIF($status and $status != 'all')->andWhere('t1.status')->in($status)->fi() ->andWhere('t1.deleted')->eq(0) ->andWhere('t1.type')->eq($storyType) diff --git a/module/testcase/control.php b/module/testcase/control.php index 016903c479..4ff0d1634d 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -328,7 +328,7 @@ class testcase extends control $modules = $this->loadModel('tree')->getStoryModule($currentModuleID); $modules = $this->tree->getAllChildID($modules); } - $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null'); + $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null', 'story', false); if($storyID and !isset($stories[$storyID])) $stories = $this->story->formatStories(array($storyID => $story)) + $stories;//Fix bug #2406. /* Set custom. */ diff --git a/module/testcase/js/batchcreate.js b/module/testcase/js/batchcreate.js index 52aca5f003..d6153d2d5f 100644 --- a/module/testcase/js/batchcreate.js +++ b/module/testcase/js/batchcreate.js @@ -23,7 +23,7 @@ $(document).ready(function() } } } - var link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID='+ ($(select).val() || '0') + '&onlyOption=true&status=noclosed&limit=0&type=null'); + var link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID='+ ($(select).val() || '0') + '&onlyOption=true&status=noclosed&limit=0&type=null&hasParent=0'); var $story = $('#story' + index); if($story.data('loadLink') !== link) { From db2fc06f49d5daa8578cf2cafac5386f84670f14 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 13 Mar 2020 14:38:37 +0800 Subject: [PATCH 7/8] * change error word. --- module/repo/lang/de.php | 2 +- module/repo/lang/en.php | 2 +- module/repo/lang/fr.php | 2 +- module/repo/lang/zh-cn.php | 2 +- module/repo/lang/zh-tw.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php index 4e4d05b42d..ae9e79d7d3 100644 --- a/module/repo/lang/de.php +++ b/module/repo/lang/de.php @@ -166,7 +166,7 @@ $lang->repo->example->client = new stdclass(); $lang->repo->example->path = new stdclass(); $lang->repo->example->client->git = "e.g. /usr/bin/git"; $lang->repo->example->client->svn = "e.g. /usr/bin/svn"; -$lang->repo->example->path->git = "e.g. /homt/user/myproject"; +$lang->repo->example->path->git = "e.g. /home/user/myproject"; $lang->repo->example->path->svn = "e.g. http://example.googlecode.com/svn/trunk/myproject"; $lang->repo->example->config = "Config directory is required in https. Use '--config-dir' to generate config dir."; $lang->repo->example->encoding = "input encoding of files"; diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php index 4e4d05b42d..ae9e79d7d3 100644 --- a/module/repo/lang/en.php +++ b/module/repo/lang/en.php @@ -166,7 +166,7 @@ $lang->repo->example->client = new stdclass(); $lang->repo->example->path = new stdclass(); $lang->repo->example->client->git = "e.g. /usr/bin/git"; $lang->repo->example->client->svn = "e.g. /usr/bin/svn"; -$lang->repo->example->path->git = "e.g. /homt/user/myproject"; +$lang->repo->example->path->git = "e.g. /home/user/myproject"; $lang->repo->example->path->svn = "e.g. http://example.googlecode.com/svn/trunk/myproject"; $lang->repo->example->config = "Config directory is required in https. Use '--config-dir' to generate config dir."; $lang->repo->example->encoding = "input encoding of files"; diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php index 4e4d05b42d..ae9e79d7d3 100644 --- a/module/repo/lang/fr.php +++ b/module/repo/lang/fr.php @@ -166,7 +166,7 @@ $lang->repo->example->client = new stdclass(); $lang->repo->example->path = new stdclass(); $lang->repo->example->client->git = "e.g. /usr/bin/git"; $lang->repo->example->client->svn = "e.g. /usr/bin/svn"; -$lang->repo->example->path->git = "e.g. /homt/user/myproject"; +$lang->repo->example->path->git = "e.g. /home/user/myproject"; $lang->repo->example->path->svn = "e.g. http://example.googlecode.com/svn/trunk/myproject"; $lang->repo->example->config = "Config directory is required in https. Use '--config-dir' to generate config dir."; $lang->repo->example->encoding = "input encoding of files"; diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index 3771bdb711..bec02c0421 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -167,7 +167,7 @@ $lang->repo->example->client = new stdclass(); $lang->repo->example->path = new stdclass(); $lang->repo->example->client->git = "例如：/usr/bin/git"; $lang->repo->example->client->svn = "例如：/usr/bin/svn"; -$lang->repo->example->path->git = "例如：/homt/user/myproject"; +$lang->repo->example->path->git = "例如：/home/user/myproject"; $lang->repo->example->path->svn = "例如：http://example.googlecode.com/svn/trunk/myproject"; $lang->repo->example->config = "https需要填写配置目录的位置，通过config-dir选项生成配置目录"; $lang->repo->example->encoding = "填写版本库中文件的编码"; diff --git a/module/repo/lang/zh-tw.php b/module/repo/lang/zh-tw.php index 2033791753..9a6e580bb4 100644 --- a/module/repo/lang/zh-tw.php +++ b/module/repo/lang/zh-tw.php @@ -167,7 +167,7 @@ $lang->repo->example->client = new stdclass(); $lang->repo->example->path = new stdclass(); $lang->repo->example->client->git = "例如：/usr/bin/git"; $lang->repo->example->client->svn = "例如：/usr/bin/svn"; -$lang->repo->example->path->git = "例如：/homt/user/myproject"; +$lang->repo->example->path->git = "例如：/home/user/myproject"; $lang->repo->example->path->svn = "例如：http://example.googlecode.com/svn/trunk/myproject"; $lang->repo->example->config = "https需要填寫配置目錄的位置，通過config-dir選項生成配置目錄"; $lang->repo->example->encoding = "填寫版本庫中檔案的編碼"; From 054c41e2b8e1c429ff445df9d7f65c916ada1c70 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 13 Mar 2020 14:59:09 +0800 Subject: [PATCH 8/8] * adjust en lang. --- module/repo/lang/de.php | 2 +- module/repo/lang/en.php | 2 +- module/repo/lang/fr.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php index ae9e79d7d3..c425ff526e 100644 --- a/module/repo/lang/de.php +++ b/module/repo/lang/de.php @@ -44,7 +44,7 @@ $lang->repo->name = 'Name'; $lang->repo->path = 'Path'; $lang->repo->prefix = 'Prefix'; $lang->repo->config = 'Config'; -$lang->repo->desc = 'Describe'; +$lang->repo->desc = 'Description'; $lang->repo->account = 'Username'; $lang->repo->password = 'Password'; $lang->repo->encoding = 'Encoding'; diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php index ae9e79d7d3..c425ff526e 100644 --- a/module/repo/lang/en.php +++ b/module/repo/lang/en.php @@ -44,7 +44,7 @@ $lang->repo->name = 'Name'; $lang->repo->path = 'Path'; $lang->repo->prefix = 'Prefix'; $lang->repo->config = 'Config'; -$lang->repo->desc = 'Describe'; +$lang->repo->desc = 'Description'; $lang->repo->account = 'Username'; $lang->repo->password = 'Password'; $lang->repo->encoding = 'Encoding'; diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php index ae9e79d7d3..c425ff526e 100644 --- a/module/repo/lang/fr.php +++ b/module/repo/lang/fr.php @@ -44,7 +44,7 @@ $lang->repo->name = 'Name'; $lang->repo->path = 'Path'; $lang->repo->prefix = 'Prefix'; $lang->repo->config = 'Config'; -$lang->repo->desc = 'Describe'; +$lang->repo->desc = 'Description'; $lang->repo->account = 'Username'; $lang->repo->password = 'Password'; $lang->repo->encoding = 'Encoding';