From 1a2566f4a37c4c76ec3bafcc2634dacca8a58398 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Sat, 2 Aug 2025 09:42:42 +0000 Subject: [PATCH] * [bug#64415] Change the target in release view when use tutorial. --- module/release/test/ui/page/view.php | 4 ++-- module/release/ui/linkbug.html.php | 2 +- module/release/ui/publish.html.php | 1 + module/tutorial/config/productManage.php | 10 ++++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/module/release/test/ui/page/view.php b/module/release/test/ui/page/view.php index 01aefc6612..305e1d9877 100755 --- a/module/release/test/ui/page/view.php +++ b/module/release/test/ui/page/view.php @@ -31,8 +31,8 @@ class viewPage extends page /*发布关联Bug的元素*/ 'resolvedBugTab' => "//*[@id='mainContent']/div[2]/div/div/div/div/ul/li[2]/a/span", 'linkBugBtn' => "//*[@id='mainContent']/div[2]/div/div/div/div[2]/div[2]/div/button/span", - 'selectAllBug' => "//*[@id='unlinkBugList']/div[3]/div/div/label", - 'linkBugBtnBottom' => "//*[@id='unlinkBugList']/div/nav/button/span", + 'selectAllBug' => "//*[@id='linkBugList']/div[3]/div/div/label", + 'linkBugBtnBottom' => "//*[@id='linkBugList']/div/nav/button/span", 'resolvedBugNum' => "//*[@id='resolvedBugDTable']/div[3]/div[2]/strong", 'unlinkFirBugBtn' => "//*[@id='resolvedBugDTable']/div[2]/div[3]/div/div/div/nav/a/i", 'allResolvedBugBtn' => "//*[@id='resolvedBugDTable']/div[3]/div/div/label", diff --git a/module/release/ui/linkbug.html.php b/module/release/ui/linkbug.html.php index ceeb884fe0..df041e4a1d 100644 --- a/module/release/ui/linkbug.html.php +++ b/module/release/ui/linkbug.html.php @@ -36,7 +36,7 @@ searchForm $checkedRows = array_values(array_filter(array_map(function($bug) use($type) {return ($type == 'leftBug' or $bug->status == 'resolved' or $bug->status == 'closed') ? $bug->id : 0;}, $allBugs))); dtable ( - set::id('unlinkBugList'), + set::id($type == 'leftBug' ? 'linkLeftBugList': 'linkBugList'), set::userMap($users), set::checkable(true), set::cols($cols), diff --git a/module/release/ui/publish.html.php b/module/release/ui/publish.html.php index a4e216a973..84db004f8a 100755 --- a/module/release/ui/publish.html.php +++ b/module/release/ui/publish.html.php @@ -13,6 +13,7 @@ modalHeader(); formPanel ( + set::id('publishForm'), set::actions(array('submit')), formRow ( diff --git a/module/tutorial/config/productManage.php b/module/tutorial/config/productManage.php index 4854671860..06b55eed2b 100644 --- a/module/tutorial/config/productManage.php +++ b/module/tutorial/config/productManage.php @@ -481,14 +481,14 @@ $productManage->basic->tasks['releaseManage']['steps'][] = array( $productManage->basic->tasks['releaseManage']['steps'][] = array( 'type' => 'selectRow', - 'target' => 'div.dtable div[data-col="id"][data-row="1"]', + 'target' => '#linkBugList div.dtable-body div[data-col="id"][data-row="1"]', 'page' => 'release-view', 'title' => $lang->tutorial->productManage->releaseManage->step11->name ); $productManage->basic->tasks['releaseManage']['steps'][] = array( 'type' => 'click', - 'target' => 'div.dtable-footer button.linkObjectBtn', + 'target' => '#linkBugList div.dtable-footer button.linkObjectBtn', 'page' => 'release-view', 'title' => $lang->tutorial->productManage->releaseManage->step12->name, 'desc' => $lang->tutorial->productManage->releaseManage->step12->desc @@ -512,14 +512,14 @@ $productManage->basic->tasks['releaseManage']['steps'][] = array( $productManage->basic->tasks['releaseManage']['steps'][] = array( 'type' => 'selectRow', - 'target' => 'div.dtable div[data-col="id"][data-row="1"]', + 'target' => '#linkLeftBugList div.dtable-body div[data-col="id"][data-row="1"]', 'page' => 'release-view', 'title' => $lang->tutorial->productManage->releaseManage->step15->name ); $productManage->basic->tasks['releaseManage']['steps'][] = array( 'type' => 'click', - 'target' => 'div.dtable-footer button.linkObjectBtn', + 'target' => '#linkLeftBugList div.dtable-footer button.linkObjectBtn', 'page' => 'release-view', 'title' => $lang->tutorial->productManage->releaseManage->step16->name, 'desc' => $lang->tutorial->productManage->releaseManage->step16->desc @@ -535,12 +535,14 @@ $productManage->basic->tasks['releaseManage']['steps'][] = array( $productManage->basic->tasks['releaseManage']['steps'][] = array( 'type' => 'form', + 'target' => '#publishForm', 'page' => 'release-view', 'title' => $lang->tutorial->productManage->releaseManage->step18->name ); $productManage->basic->tasks['releaseManage']['steps'][] = array( 'type' => 'saveForm', + 'target' => '#publishForm button[type="submit"]', 'page' => 'release-view', 'title' => $lang->tutorial->productManage->releaseManage->step19->name, 'desc' => $lang->tutorial->productManage->releaseManage->step19->desc