From 1db241cb431ddafdd98419c91e89d3765c44527f Mon Sep 17 00:00:00 2001
From: tianshujie98
Date: Thu, 5 Nov 2020 15:30:33 +0800
Subject: [PATCH 05/16] * Fix bug.
---
module/doc/model.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/doc/model.php b/module/doc/model.php
index 243c627180..294fa9ea6a 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -619,7 +619,7 @@ class docModel extends model
->join('groups', ',')
->join('users', ',')
->join('mailto', ',')
- ->remove('files,labels,uid')
+ ->remove('files,labels,uid,contactListMenu')
->get();
/* Fix bug #2929. strip_tags($this->post->contentMarkdown, $this->config->allowedTags)*/
From 8a15ec21d92374357a8f6b91e846c307b932df3d Mon Sep 17 00:00:00 2001
From: tianshujie98
Date: Thu, 5 Nov 2020 15:52:31 +0800
Subject: [PATCH 06/16] * Fix bug.
---
module/doc/model.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/doc/model.php b/module/doc/model.php
index 294fa9ea6a..cd665496e1 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -695,7 +695,7 @@ class docModel extends model
->join('groups', ',')
->join('users', ',')
->join('mailto', ',')
- ->remove('comment,files,labels,uid')
+ ->remove('comment,files,labels,uid,contactListMenu')
->get();
if($doc->contentType == 'markdown') $doc->content = $this->post->content;
if($doc->acl == 'private') $doc->users = $oldDoc->addedBy;
From 76a793ab0337939ed58fbc047d89aafa1e756092 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 5 Nov 2020 16:05:03 +0800
Subject: [PATCH 07/16] * Fix a bug.
---
module/testtask/control.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 69c74632aa..d9093c6fb0 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -436,6 +436,7 @@ class testtask extends control
$this->config->testcase->search['params']['product']['values'] = array($productID => $this->products[$productID], 'all' => $this->lang->testcase->allProduct);
$this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case');
$this->config->testcase->search['params']['status']['values'] = array('' => '') + $this->lang->testtask->statusList;
+ $this->config->testcase->search['params']['lib']['values'] = $this->loadModel('caselib')->getLibraries();
$this->config->testcase->search['queryID'] = $queryID;
$this->config->testcase->search['fields']['assignedTo'] = $this->lang->testtask->assignedTo;
From dfb3c735519116f3469aa9356089cc5f57d05198 Mon Sep 17 00:00:00 2001
From: tianshujie98
Date: Thu, 5 Nov 2020 16:28:46 +0800
Subject: [PATCH 08/16] * Adjust code style.
---
module/build/config.php | 2 ++
module/build/model.php | 2 +-
module/project/control.php | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/module/build/config.php b/module/build/config.php
index 3d5c761e9a..86715fa4b7 100644
--- a/module/build/config.php
+++ b/module/build/config.php
@@ -18,6 +18,7 @@ $config->build->search['fields']['scmPath'] = $lang->build->scmPath;
$config->build->search['fields']['filePath'] = $lang->build->filePath;
$config->build->search['fields']['date'] = $lang->build->date;
$config->build->search['fields']['builder'] = $lang->build->builder;
+$config->build->search['fields']['desc'] = $lang->build->desc;
$config->build->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->build->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => 'products');
@@ -25,3 +26,4 @@ $config->build->search['params']['scmPath'] = array('operator' => 'include', 'c
$config->build->search['params']['filePath'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->build->search['params']['date'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->build->search['params']['builder'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
+$config->build->search['params']['desc'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
diff --git a/module/build/model.php b/module/build/model.php
index 85f0619bf5..b0a06424be 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -102,7 +102,7 @@ class buildModel extends model
}
/* Distinguish between repeated fields. */
- $fields = array('id' => '`id`', 'name' => '`name`', 'product' => '`product`');
+ $fields = array('id' => '`id`', 'name' => '`name`', 'product' => '`product`', 'desc' => '`desc`');
foreach($fields as $field)
{
if(strpos($this->session->projectBuildQuery, $field) !== false)
diff --git a/module/project/control.php b/module/project/control.php
index b9fd97b993..95da62c82b 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -871,7 +871,7 @@ class project extends control
$projectID = $project->id;
/* Get products' list. */
- $products = $this->loadModel('product')->getPairs('nocode');
+ $products = $this->project->getProducts($projectID, false);
$products = array($this->lang->company->product) + $products;
/* Build the search form. */
From 0a30b6b09f0b09f16a4a67a4838016254a52423d Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 5 Nov 2020 16:29:43 +0800
Subject: [PATCH 09/16] * Fix a bug.
---
module/story/view/view.html.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 057d9a977f..7b1e76284e 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -144,10 +144,10 @@
echo "