story->pri;?>
From f36338d4e0b6a7c3fa27d8ea6a8d129c8641dbc2 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 13 May 2021 14:30:10 +0800
Subject: [PATCH 08/10] * Fix error.
---
module/user/model.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/user/model.php b/module/user/model.php
index aafa1289d0..f2b301d7af 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -303,7 +303,7 @@ class userModel extends model
$this->loadModel('mail');
if($this->config->mail->mta == 'sendcloud' and !empty($user->email)) $this->mail->syncSendCloud('sync', $user->email, $user->realname);
- return $usereID;
+ return $userID;
}
}
From 39c2c6b267e3fbe09268c53876a5ed20af948ae6 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 13 May 2021 14:34:14 +0800
Subject: [PATCH 09/10] * Adjust the code.
---
module/testtask/control.php | 3 +++
module/testtask/js/common.js | 5 -----
module/testtask/js/create.js | 6 ------
module/testtask/view/create.html.php | 2 +-
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/module/testtask/control.php b/module/testtask/control.php
index df588ad8cf..b9f094b6a9 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -244,6 +244,8 @@ class testtask extends control
$executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
$builds = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk', true);
+ $testreports = empty($build) ? array() : $this->dao->select('id,title')->from(TABLE_TESTREPORT)->where('builds')->like('%' . $build . '%')->fetchPairs('id','title');
+
/* Set menu. */
$productID = $this->product->saveState($productID, $this->products);
@@ -258,6 +260,7 @@ class testtask extends control
$this->view->executions = $executions;
$this->view->builds = $builds;
$this->view->build = $build;
+ $this->view->testreports = $testreports;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|qdfirst|nodeleted');
$this->display();
diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js
index 106e78fb92..848fe6be67 100644
--- a/module/testtask/js/common.js
+++ b/module/testtask/js/common.js
@@ -91,11 +91,6 @@ function loadExecutionBuilds(executionID)
{
$('#resolvedBuild').attr('id', 'build').attr('name', 'build').find('option[value=trunk]').remove();
$('#build').chosen();
-
- testreportData = '';
- $('#testreport').replaceWith(testreportData);
- $('#testreport_chosen').remove();
- $("#testreport").chosen();
});
}
diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js
index 1e970ff12c..50a185667b 100755
--- a/module/testtask/js/create.js
+++ b/module/testtask/js/create.js
@@ -12,12 +12,6 @@ function loadProductRelated()
$('#build_chosen').remove();
$("#build").chosen();
$('#build').trigger("chosen:updated");
-
- testreportData = '';
- $('#testreport').replaceWith(testreportData);
- $('#testreport_chosen').remove();
- $("#testreport").chosen();
- $('#testreport').trigger("chosen:updated");
}
/**
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index 1392b5effb..de900349e5 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -80,7 +80,7 @@