From be0f4320e6bef78c9a33a1909c42f2be744489e8 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Fri, 18 Jun 2021 11:25:28 +0800
Subject: [PATCH 1/4] * Fix bug #13248.

---
 module/block/view/meetingblock.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/block/view/meetingblock.html.php b/module/block/view/meetingblock.html.php
index 77d522c704..aeee0bf11b 100644
--- a/module/block/view/meetingblock.html.php
+++ b/module/block/view/meetingblock.html.php
@@ -4,7 +4,7 @@
 <style>
 .block-meetings .c-id {width: 50px;}
 .block-meetings .c-date {width: 100px;}
-.block-meetings .c-dept {width: 80px;}
+.block-meetings .c-dept {width: 80px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 .block-meetings .c-mode {width: 80px;}
 .block-meetings .c-minutedBy {width: 80px;}
 .block-meetings .c-host {width: 80px;}
@@ -34,8 +34,8 @@
         <td class='c-date'><?php echo $meeting->date == '0000-00-00' ? '' : $meeting->date;?></td>
         <td class='c-name' title='<?php echo $meeting->name?>'><?php echo html::a($this->createLink('meeting', 'view', "meetingID=$meeting->id"), $meeting->name, '', "data-app='my'")?></td>
         <?php if($longBlock):?>
-        <td class='c-dept'><?php echo zget($depts, $meeting->dept)?></td>
-        <td class='c-mode'><?php echo zget($lang->meeting->modeList, $meeting->dept)?></td>
+        <td class='c-dept' title="<?php echo zget($depts, $meeting->dept)?>"><?php echo zget($depts, $meeting->dept)?></td>
+        <td class='c-mode'><?php echo zget($lang->meeting->modeList, $meeting->mode)?></td>
         <td class='c-minutedBy'><?php echo zget($users, $meeting->minutedBy);?></td>
         <?php endif;?>
         <td class='c-host'><?php echo zget($users, $meeting->host);?></td>

From 00985acb35a30396eb75861795b0385a4d7fd800 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Fri, 18 Jun 2021 13:36:50 +0800
Subject: [PATCH 2/4] * Fix bug 13246.

---
 module/block/view/todoblock.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index 55cb05f1c3..18562676dd 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -22,6 +22,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
 .block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden;}
 .block-todoes .todoes > li:hover {background-color: #e9f2fb;}
 .block-todoes .todo-title {padding: 5px 15px 5px 5px;}
+.titleBox {width: 700px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block;}
 .block-todoes .todo-pri {margin: 0 5px;}
 .block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 95px;}
 .block-todoes .todo-check {position: absolute; top: 5px; left: 10px; display: block; width: 20px; height: 20px; font-size: 20px; color: transparent; cursor: pointer; background: #fff; border: 2px solid #eee; border-radius: 50%;}
@@ -94,7 +95,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
       $appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
       $viewLink = $this->createLink('todo', 'view', "todoID={$todo->id}&from=my", 'html', true);
       ?>
-      <li data-id='<?php echo $todo->id?>'>
+      <li data-id='<?php echo $todo->id?>' class='titleBox'>
         <span class="todo-check icon icon-check-circle"></span>
         <a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe' data-toggle='modal' <?php echo $appid?>>
           <?php if ($todo->date == '2030-01-01') :?>

From 637a3c29e42a9c81d8cf5fdc03055d552d3cf96e Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Fri, 18 Jun 2021 14:16:02 +0800
Subject: [PATCH 3/4] * Fix bug.

---
 module/webhook/model.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/webhook/model.php b/module/webhook/model.php
index d68eae960f..b5f8849284 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -447,13 +447,20 @@ class webhookModel extends model
     public function getViewLink($objectType, $objectID)
     {
         $oldOnlyBody = '';
+        $openApp     = '';
         if(isset($_GET['onlybody']) and $_GET['onlybody'] == 'yes')
         {
             $oldOnlyBody = 'yes';
             unset($_GET['onlybody']);
         }
         if($objectType == 'case') $objectType = 'testcase';
-        $viewLink = helper::createLink($objectType, 'view', "id=$objectID", 'html');
+        if($objectType == 'meeting')
+        {
+            $meeting = $this->dao->findById($objectID)->from(TABLE_MEETING)->fetch();
+            $openApp = $meeting->project ? '#app=project' : '#app=my';
+        }
+
+        $viewLink = helper::createLink($objectType, 'view', "id=$objectID", 'html') . $openApp;
         if($oldOnlyBody) $_GET['onlybody'] = $oldOnlyBody;
 
         return $viewLink;

From 4c792a23184ed512a30bdfdfe0e8198ea5e47482 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Fri, 18 Jun 2021 14:41:03 +0800
Subject: [PATCH 4/4] * Fix bug.

---
 module/webhook/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/webhook/model.php b/module/webhook/model.php
index b5f8849284..3ec491cb46 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -380,7 +380,7 @@ class webhookModel extends model
             $intersect       = array_intersect($webhookProducts, $actionProduct);
             if(!$intersect) return false;
         }
-        if($webhook->executions)
+        if(isset($webhook->executions))
         {
             if(strpos(",$webhook->executions,", ",$action->execution,") === false) return false;
         }