From 60bf52902e0b3019fe44867a42e6129fee1cf41c Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 10 Sep 2024 09:47:51 +0800 Subject: [PATCH] * [bug#55003] Set class of design commit submit in tutorial. --- module/design/config.php | 1 + module/design/ui/view.html.php | 1 - module/execution/model.php | 2 +- module/tutorial/model.php | 5 +++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/module/design/config.php b/module/design/config.php index 973114caee..b8cb3e4e92 100644 --- a/module/design/config.php +++ b/module/design/config.php @@ -64,6 +64,7 @@ $config->design->actionList['linkCommit']['data-toggle'] = 'modal'; $config->design->actionList['linkCommit']['data-position'] = 'center'; $config->design->actionList['linkCommit']['data-size'] = 'lg'; $config->design->actionList['linkCommit']['data-id'] = 'linkCommitModal'; +$config->design->actionList['linkCommit']['class'] = 'linkCommit-btn'; $config->design->view->operateList['main'] = array('assignTo', 'linkCommit'); $config->design->view->operateList['common'] = array('edit', 'delete'); diff --git a/module/design/ui/view.html.php b/module/design/ui/view.html.php index ad682c56db..e5f5fb45b4 100644 --- a/module/design/ui/view.html.php +++ b/module/design/ui/view.html.php @@ -26,7 +26,6 @@ foreach($config->design->view->operateList['main'] as $operate) { $config->design->actionList[$operate]['url'] = createLink('repo', 'create', "projectID={$design->project}"); $config->design->actionList[$operate]['data-app'] = 'project'; - $config->design->actionList[$operate]['class'] = 'linkCommit-btn'; unset($config->design->actionList[$operate]['data-toggle']); } $operateMenus[] = $config->design->actionList[$operate]; diff --git a/module/execution/model.php b/module/execution/model.php index c21cbfb928..3297b5fbed 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -2836,7 +2836,7 @@ class executionModel extends model $linkedStories = $this->dao->select('story,`order`')->from(TABLE_PROJECTSTORY)->where('project')->eq($executionID)->orderBy('order_desc')->fetchPairs('story', 'order'); $lastOrder = (int)reset($linkedStories); $storyList = $this->dao->select('id, status, branch, product, type')->from(TABLE_STORY)->where('id')->in(array_values($stories))->fetchAll('id'); - $execution = $this->fetchByID($executionID); + $execution = $this->getByID($executionID); $notAllowedStatus = $this->app->rawMethod == 'batchcreate' ? 'closed' : 'draft,reviewing,closed'; $laneID = isset($output['laneID']) ? $output['laneID'] : 0; diff --git a/module/tutorial/model.php b/module/tutorial/model.php index 9a221cd49b..f1477da098 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -345,6 +345,9 @@ class tutorialModel extends model $story->lastEditedDate = ''; $story->twins = ''; $story->executions = array(); + $story->spec = ''; + $story->verify = ''; + $story->files = array(); return $story; } @@ -1465,6 +1468,8 @@ class tutorialModel extends model $design->desc = 'Design Description'; $design->version = 1; $design->type = 'HLDS'; + $design->files = array(); + $design->productName = 'Test product'; return $design; }