From 59acd48cd393a8d380dbfff2bbc51519a6a3a0ee Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 30 Jun 2022 13:42:52 +0800
Subject: [PATCH 1/3] * Fix bug #24599.

---
 module/kanban/control.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 6eb6747023..40f8c8d49c 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1433,8 +1433,7 @@ class kanban extends control
 
             if(isonlybody()) return print(js::reload('parent.parent'));
 
-            $card        = $this->kanban->getCardByID($cardID);
-            $kanbanGroup = $this->kanban->getKanbanData($card->kanban, $card->region);
+            $kanbanGroup      = $this->kanban->getKanbanData($card->kanban, $card->region);
             $kanbanGroupParam = json_encode($kanbanGroup);
             return print("<script>parent.updateRegion({$card->region}, $kanbanGroupParam)</script>");
         }

From 076a744a0adf94af957d8a425fd59941be3ff130 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 30 Jun 2022 13:58:18 +0800
Subject: [PATCH 2/3] * Fix bug #23914, #23999.

---
 module/common/view/action.html.php  | 2 +-
 module/doc/config.php               | 7 ++++---
 module/doc/view/objectlibs.html.php | 1 +
 module/kanban/config.php            | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php
index b07da8587d..af01e2dd8a 100755
--- a/module/common/view/action.html.php
+++ b/module/common/view/action.html.php
@@ -50,7 +50,7 @@
     <ol class='histories-list'>
       <?php $i = 1; ?>
       <?php foreach($actions as $action):?>
-      <?php $canEditComment = ((!isset($canBeChanged) or !empty($canBeChanged)) and end($actions) == $action and trim($action->comment) != '' and $this->methodName == 'view' and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
+      <?php $canEditComment = ((!isset($canBeChanged) or !empty($canBeChanged)) and end($actions) == $action and trim($action->comment) != '' and strpos(',view,objectlibs,viewcard,', ",$this->methodName,") and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
       <li value='<?php echo $i ++;?>'>
         <?php
         $action->actor = zget($users, $action->actor);
diff --git a/module/doc/config.php b/module/doc/config.php
index 626efc5a30..45fac598de 100644
--- a/module/doc/config.php
+++ b/module/doc/config.php
@@ -21,9 +21,10 @@ $config->doc->custom->objectLibs = $config->doc->customObjectLibs;
 $config->doc->custom->showLibs   = 'zero,children';
 
 $config->doc->editor = new stdclass();
-$config->doc->editor->create = array('id' => 'content', 'tools' => 'fullTools');
-$config->doc->editor->edit   = array('id' => 'content', 'tools' => 'fullTools');
-$config->doc->editor->view   = array('id' => 'comment,lastComment', 'tools' => 'simple');
+$config->doc->editor->create     = array('id' => 'content', 'tools' => 'fullTools');
+$config->doc->editor->edit       = array('id' => 'content', 'tools' => 'fullTools');
+$config->doc->editor->view       = array('id' => 'comment,lastComment', 'tools' => 'simple');
+$config->doc->editor->objectlibs = array('id' => 'comment,lastComment', 'tools' => 'simple');
 
 $config->doc->markdown = new stdclass();
 $config->doc->markdown->create = array('id' => 'contentMarkdown', 'tools' => 'withchange');
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index cd6df9b47c..26478698e9 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
 <?php if($app->tab == 'execution'):;?>
 <style>.panel-body{min-height: 180px}</style>
 <?php endif;?>
diff --git a/module/kanban/config.php b/module/kanban/config.php
index fc6374a1ff..27373d5b3f 100644
--- a/module/kanban/config.php
+++ b/module/kanban/config.php
@@ -40,7 +40,7 @@ $config->kanban->editor->createcard    = array('id' => 'desc', 'tools' => 'simpl
 $config->kanban->editor->activate      = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->kanban->editor->close         = array('id' => 'comment', 'tools' => 'simpleTools');
 $config->kanban->editor->editcard      = array('id' => 'desc', 'tools' => 'simpleTools');
-$config->kanban->editor->viewcard      = array('id' => 'comment', 'tools' => 'simpleTools');
+$config->kanban->editor->viewcard      = array('id' => 'comment,lastComment', 'tools' => 'simpleTools');
 $config->kanban->editor->activatecard  = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->kanban->fromType         = array('execution', 'productplan', 'release', 'build');

From 61a1405ff251cb287a84da9df1129b273d9ae1db Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 30 Jun 2022 14:03:24 +0800
Subject: [PATCH 3/3] * Fix bug #23914, #23999.

---
 module/common/view/action.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php
index af01e2dd8a..24dd9fcd79 100755
--- a/module/common/view/action.html.php
+++ b/module/common/view/action.html.php
@@ -50,7 +50,7 @@
     <ol class='histories-list'>
       <?php $i = 1; ?>
       <?php foreach($actions as $action):?>
-      <?php $canEditComment = ((!isset($canBeChanged) or !empty($canBeChanged)) and end($actions) == $action and trim($action->comment) != '' and strpos(',view,objectlibs,viewcard,', ",$this->methodName,") and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
+      <?php $canEditComment = ((!isset($canBeChanged) or !empty($canBeChanged)) and end($actions) == $action and trim($action->comment) != '' and strpos(',view,objectlibs,viewcard,', ",$this->methodName,") !== false and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
       <li value='<?php echo $i ++;?>'>
         <?php
         $action->actor = zget($users, $action->actor);