From cdcd17b0fea1c61dfe34482d1ae259a4b9f70aed Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 14 Jul 2020 01:59:30 -0700
Subject: [PATCH 01/17] * Finish task#7346.
---
module/webhook/control.php | 13 +++++++++++++
module/webhook/model.php | 10 +++++++---
module/webhook/view/browse.html.php | 3 ++-
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/module/webhook/control.php b/module/webhook/control.php
index 3fcdbfb22a..ba01b36270 100644
--- a/module/webhook/control.php
+++ b/module/webhook/control.php
@@ -135,6 +135,19 @@ class webhook extends control
*/
public function log($id, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
+ /* Save session. */
+ $uri = $this->app->getURI(true);
+ $this->session->set('productList', $uri);
+ $this->session->set('productPlanList', $uri);
+ $this->session->set('releaseList', $uri);
+ $this->session->set('storyList', $uri);
+ $this->session->set('projectList', $uri);
+ $this->session->set('taskList', $uri);
+ $this->session->set('buildList', $uri);
+ $this->session->set('bugList', $uri);
+ $this->session->set('caseList', $uri);
+ $this->session->set('testtaskList', $uri);
+
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
diff --git a/module/webhook/model.php b/module/webhook/model.php
index e069f23ff4..36924c7878 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -87,10 +87,14 @@ class webhookModel extends model
}
$text = '';
- if(isset($data->markdown) and is_object($data->markdown))
+ if(isset($data->markdown->text))
{
$text = substr($data->markdown->text, 0, strpos($data->markdown->text, '(http'));
}
+ elseif(isset($data->markdown->content))
+ {
+ $text = substr($data->markdown->content, 0, strpos($data->markdown->content, '(http'));
+ }
else
{
$text = substr($data->text, 0, strpos($data->text, '(http')) ? substr($data->text, 0, strpos($data->text, '(http')) : zget($users, $data->user, $this->app->user->realname) . $this->lang->action->label->{$action->action} . $this->lang->action->objectTypes[$action->objectType] . "[#{$action->objectID}::{$object->$field}]";
@@ -321,9 +325,9 @@ class webhookModel extends model
$this->saveData($id, $actionID, $postData, $actor);
continue;
}
-
+
$result = $this->fetchHook($webhook, $postData, $actionID);
- $this->saveLog($webhook, $actionID, $postData, $result);
+ if(!empty($result)) $this->saveLog($webhook, $actionID, $postData, $result);
}
return !dao::isError();
}
diff --git a/module/webhook/view/browse.html.php b/module/webhook/view/browse.html.php
index 735a625465..6747eb01bf 100644
--- a/module/webhook/view/browse.html.php
+++ b/module/webhook/view/browse.html.php
@@ -34,7 +34,8 @@
url;?> |
type == 'dinguser' or $webhook->type == 'wechatuser') common::printIcon('webhook', 'chooseDept', "webhookID=$id", '', 'list', 'link');
+ if($webhook->type == 'dinguser') common::printIcon('webhook', 'chooseDept', "webhookID=$id", '', 'list', 'link');
+ if($webhook->type == 'wechatuser') common::printIcon('webhook', 'bind', "webhookID=$id", '', 'list', 'link');
common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text');
common::printIcon('webhook', 'edit', "webhookID=$id", '', 'list');
if(common::hasPriv('webhook', 'delete'))
From 0dddf6deda689aa13af669f4c15d09f62fc90d0f Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 14 Jul 2020 02:02:13 -0700
Subject: [PATCH 02/17] * Finish task#7346.
---
module/testcase/model.php | 2 +-
module/testtask/view/groupcase.html.php | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 81dc880006..00b9125aea 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -287,7 +287,7 @@ class testcaseModel extends model
$data[$i]->type = $cases->type[$i];
$data[$i]->pri = $cases->pri[$i];
$data[$i]->stage = empty($cases->stage[$i]) ? '' : implode(',', $cases->stage[$i]);
- $data[$i]->story = $storyID ? $storyID : $cases->story[$i];
+ $data[$i]->story = $cases->story[$i];
$data[$i]->color = $cases->color[$i];
$data[$i]->title = $cases->title[$i];
$data[$i]->precondition = $cases->precondition[$i];
diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index 74c834e120..427c848a95 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -14,6 +14,7 @@
+testtask->confirmUnlinkCase)?>
@@ -77,7 +78,13 @@
|
id&caseID=$run->case&version=$run->caseVersion", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");?>
case", '', 'list');?>
- case", '', 'list', '', 'hiddenwin');?>
+ id&confirm=yes");
+ echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"casesForm\", confirmUnlink)", '', '', "title='{$this->lang->testtask->unlinkCase}' class='btn'");
+ }
+ ?>
|
From 66081ad48f66a574382261bb861dc722d9afe9da Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Wed, 15 Jul 2020 09:24:33 +0800
Subject: [PATCH 03/17] * Finish task #7450.
---
module/doc/css/view.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index b62e842ac4..85f6f76baf 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -1,7 +1,8 @@
.versions .dropdown-menu{max-height:260px; overflow-y:auto;}
.table-data > tbody > tr > th.w-80px {width:80px;}
+.article-content{overflow: visible}
.detail-content .file-image{position: relative; padding: 0 10px;}
-.detail-content .file-image > span.right-icon{position: absolute; right: 0px; top: 0;}
+.detail-content .file-image > span.right-icon{position: absolute; right: -10px; top: 0;}
#urlIframe{border:0px;}
#urlCard{border:1px solid #ccc; width:100%; min-height:100px; padding:8px; border-radius: 4px; margin:103px 0;
From bda11a547aef011cab865b3169d57db3be01303f Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 14 Jul 2020 18:28:02 -0700
Subject: [PATCH 04/17] * Finish task#7369.
---
module/todo/view/batchcreate.html.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 352fc49c32..0fe32dda38 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -17,7 +17,6 @@
createLink('custom', 'ajaxSaveCustomFields', 'module=todo§ion=custom&key=batchCreateFields')?>
-
|