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

* [task#126372,doing,0.5h] Change the tutorial of planManage and releaseManage.

Browse Source
This commit is contained in:
xieqiyu
2024-09-04 17:31:41 +08:00
committed by 王于听
parent 0455cba82d
commit bf83ab9b84
5 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+4
View File
@@ -125,6 +125,8 @@ class bugModel extends model
*/
public function getPlanBugs(int $planID, string $status = 'all', string $orderBy = 'id_desc', object $pager = null): array
{
if(common::isTutorialMode()) return array();
if(strpos($orderBy, 'pri_') !== false) $orderBy = str_replace('pri_', 'priOrder_', $orderBy);
$bugs = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) AS priOrder")->from(TABLE_BUG)
@@ -214,6 +216,8 @@ class bugModel extends model
*/
public function getActiveBugs(array|int $products, int|string $branch, string $executions, array $excludeBugs, object $pager = null, string $orderBy = 'id desc'): array
{
if(common::isTutorialMode()) return $this->loadModel('tutorial')->getBugs();
return $this->dao->select('*')->from(TABLE_BUG)
->where('status')->eq('active')
->andWhere('toStory')->eq(0)
module/release/ui/view.html.php
+3 -3
View File
@@ -167,7 +167,7 @@ if($canBeChanged)
set::icon('link'),
set::type('primary'),
set::className('linkStory-btn'),
bind::click("window.showLink('story')")
bind::click('window.showLink', array('params' => array('story')))
);
}
@@ -179,7 +179,7 @@ if($canBeChanged)
set::icon('bug'),
set::type('primary'),
set::className('linkBug-btn'),
bind::click("window.showLink('bug')")
bind::click('window.showLink', array('params' => array('bug')))
);
$linkLeftBtn = btn
@@ -188,7 +188,7 @@ if($canBeChanged)
set::icon('bug'),
set::type('primary'),
set::className('leftBug-btn'),
bind::click("window.showLink('leftBug')")
bind::click('window.showLink', array('params' => array('leftBug')))
);
}
}
module/story/model.php
+2
View File
@@ -419,6 +419,8 @@ class storyModel extends model
*/
public function getPlanStories(int $planID, string $status = 'all', string $orderBy = 'id_desc', object|null $pager = null): array
{
if(common::isTutorialMode()) return array();
if(strpos($orderBy, 'module') !== false)
{
$orderBy = (strpos($orderBy, 'module_asc') !== false) ? 't3.path asc' : 't3.path desc';
module/tutorial/config/productManage.php
+3 -14
View File
@@ -284,7 +284,7 @@ $productManage->tasks['planManage']['steps'][] = array(
$productManage->tasks['planManage']['steps'][] = array(
'type' => 'click',
'target' => '#stories button.linkBug-btn',
'target' => '#bugs button.linkBug-btn',
'page' => 'productplan-view',
'url' => array('productplan', 'view', 'planID=1&type=bug'),
'title' => $lang->tutorial->productManage->planManage->step10->name,
@@ -295,7 +295,6 @@ $productManage->tasks['planManage']['steps'][] = array(
'type' => 'selectRow',
'target' => 'div.dtable div[data-col="id"][data-row="1"]',
'page' => 'productplan-view',
'url' => array('productplan', 'view', 'planID=1&type=bug'),
'title' => $lang->tutorial->productManage->planManage->step11->name
);
@@ -303,7 +302,6 @@ $productManage->tasks['planManage']['steps'][] = array(
'type' => 'click',
'target' => 'div.dtable-footer button.linkObjectBtn',
'page' => 'productplan-view',
'url' => array('productplan', 'view', 'planID=1&type=bug'),
'title' => $lang->tutorial->productManage->planManage->step12->name,
'desc' => $lang->tutorial->productManage->planManage->step12->desc
);
@@ -378,9 +376,8 @@ $productManage->tasks['releaseManage']['steps'][] = array(
$productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'click',
'target' => 'div[data-key="resolvedBug"] a',
'target' => 'li[data-key="resolvedBug"] a',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=bug'),
'title' => $lang->tutorial->productManage->releaseManage->step9->name,
'desc' => $lang->tutorial->productManage->releaseManage->step9->desc
);
@@ -389,7 +386,6 @@ $productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'click',
'target' => '#resolvedBug button.linkBug-btn',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=bug'),
'title' => $lang->tutorial->productManage->releaseManage->step10->name,
'desc' => $lang->tutorial->productManage->releaseManage->step10->desc
);
@@ -398,7 +394,6 @@ $productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'selectRow',
'target' => 'div.dtable div[data-col="id"][data-row="1"]',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=bug'),
'title' => $lang->tutorial->productManage->releaseManage->step11->name
);
@@ -406,16 +401,14 @@ $productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'click',
'target' => 'div.dtable-footer button.linkObjectBtn',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=bug'),
'title' => $lang->tutorial->productManage->releaseManage->step12->name,
'desc' => $lang->tutorial->productManage->releaseManage->step12->desc
);
$productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'click',
'target' => 'div[data-key="leftBug"] a',
'target' => 'li[data-key="leftBug"] a',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=leftBug'),
'title' => $lang->tutorial->productManage->releaseManage->step13->name,
'desc' => $lang->tutorial->productManage->releaseManage->step13->desc
);
@@ -424,7 +417,6 @@ $productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'click',
'target' => '#leftBug button.leftBug-btn',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=leftBug'),
'title' => $lang->tutorial->productManage->releaseManage->step14->name,
'desc' => $lang->tutorial->productManage->releaseManage->step14->desc
);
@@ -433,7 +425,6 @@ $productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'selectRow',
'target' => 'div.dtable div[data-col="id"][data-row="1"]',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=leftBug'),
'title' => $lang->tutorial->productManage->releaseManage->step15->name
);
@@ -441,7 +432,6 @@ $productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'click',
'target' => 'div.dtable-footer button.linkObjectBtn',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=leftBug'),
'title' => $lang->tutorial->productManage->releaseManage->step16->name,
'desc' => $lang->tutorial->productManage->releaseManage->step16->desc
);
@@ -450,7 +440,6 @@ $productManage->tasks['releaseManage']['steps'][] = array(
'type' => 'click',
'target' => 'div.detail-header a.publish-btn',
'page' => 'release-view',
'url' => array('release', 'view', 'releaseID=1&type=leftBug'),
'title' => $lang->tutorial->productManage->releaseManage->step17->name,
'desc' => $lang->tutorial->productManage->releaseManage->step17->desc
);
module/tutorial/model.php
+1 -1
View File
@@ -1614,7 +1614,7 @@ class tutorialModel extends model
$plan = new stdClass();
$plan->id = 1;
$plan->product = 1;
$plan->branch = 0;
$plan->branch = '0';
$plan->parent = 0;
$plan->title = 'Test plan';
$plan->status = 'wait';