From ce48a83014a90cedf2bfdc0685e4aa4b04aa7bc1 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 14 Dec 2021 11:25:14 +0800
Subject: [PATCH] * Add setting button print permission.

---
 module/kanban/control.php              | 10 +++++-----
 module/kanban/model.php                | 24 ++++++++++++++++--------
 module/kanban/view/createcard.html.php |  4 ++--
 module/kanban/view/editcard.html.php   |  4 ++--
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 11558c05ef..da0e220524 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -56,7 +56,7 @@ class kanban extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
         }
 
-        $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed');
+        $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
 
         $this->display();
     }
@@ -84,7 +84,7 @@ class kanban extends control
         }
 
         $this->view->space = $this->kanban->getSpaceById($spaceID);
-        $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed');
+        $this->view->users = $this->loadModel('user')->getPairs('noclosed');
 
         $this->display();
     }
@@ -108,7 +108,7 @@ class kanban extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
         }
 
-        $this->view->users      = $this->loadModel('user')->getPairs('noletter|noclosed');
+        $this->view->users      = $this->loadModel('user')->getPairs('noclosed|nodeleted');
         $this->view->spaceID    = $spaceID;
         $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs();
 
@@ -137,7 +137,7 @@ class kanban extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
         }
 
-        $this->view->users      = $this->loadModel('user')->getPairs('noletter|noclosed');
+        $this->view->users      = $this->loadModel('user')->getPairs('noclosed');
         $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs();
         $this->view->kanban     = $this->kanban->getByID($kanbanID);
 
@@ -307,7 +307,7 @@ class kanban extends control
 
         $this->view->card     = $this->kanban->getCardByID($cardID);
         $this->view->actions  = $this->action->getList('kanbancard', $cardID);
-        $this->view->users    = $this->loadModel('user')->getPairs('noletter');
+        $this->view->users    = $this->loadModel('user')->getPairs('noclosed');
         $this->view->allUsers = $this->loadModel('user')->getPairs();
 
         $this->display();
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 84463c7412..af40260457 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1643,15 +1643,23 @@ class kanbanModel extends model
         $actions  = '';
         $actions .= "<div class='btn-group'>";
         $actions .= "<a href='javascript:fullScreen();' id='fullScreenBtn' class='btn btn-link'><i class='icon icon-fullscreen'></i> {$this->lang->kanban->fullScreen}</a>";
-        $actions .= "<a data-toggle='dropdown' class='btn btn-link dropdown-toggle setting' type='button'>" . '<i class="icon icon-cog-outline"></i> ' . $this->lang->kanban->setting . '</a>';
-        $actions .= "<ul id='kanbanActionMenu' class='dropdown-menu text-left'>";
-        if(common::hasPriv('kanban', 'createRegion')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$kanban->id", '', true), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createRegion, '', "class='iframe btn btn-link'") . '</li>';
 
-        $kanbanActions  = '';
-        if(common::hasPriv('kanban', 'edit'))  $kanbanActions .= '<li>' . html::a(helper::createLink('kanban', 'edit', "kanbanID=$kanban->id", '', true), '<i class="icon icon-edit"></i>' . $this->lang->kanban->edit, '', "class='iframe btn btn-link'") . '</li>';
-        if(common::hasPriv('kanban', 'close')) $kanbanActions .= '<li>' . html::a(helper::createLink('kanban', 'close', "kanbanID=$kanban->id", '', true), '<i class="icon icon-off"></i>' . $this->lang->kanban->close, '', "class='iframe btn btn-link'") . '</li>';
-        if(common::hasPriv('kanban', 'delete')) $kanbanActions .= '<li>' . html::a(helper::createLink('kanban', 'delete', "kanbanID=$kanban->id"), '<i class="icon icon-trash"></i>' . $this->lang->kanban->delete, 'hiddenwin', "class='btn btn-link'") . '</li>';
-        if($kanbanActions) $actions .= "<div class='divider'></div>" . $kanbanActions;
+        $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'delete'));
+        if($printSettingBtn)
+        {
+            $actions .= "<a data-toggle='dropdown' class='btn btn-link dropdown-toggle setting' type='button'>" . '<i class="icon icon-cog-outline"></i> ' . $this->lang->kanban->setting . '</a>';
+            $actions .= "<ul id='kanbanActionMenu' class='dropdown-menu text-left'>";
+            if(common::hasPriv('kanban', 'createRegion')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$kanban->id", '', true), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createRegion, '', "class='iframe btn btn-link'") . '</li>';
+
+            $kanbanActions  = '';
+            if(common::hasPriv('kanban', 'edit'))  $kanbanActions .= '<li>' . html::a(helper::createLink('kanban', 'edit', "kanbanID=$kanban->id", '', true), '<i class="icon icon-edit"></i>' . $this->lang->kanban->edit, '', "class='iframe btn btn-link'") . '</li>';
+            if(common::hasPriv('kanban', 'close')) $kanbanActions .= '<li>' . html::a(helper::createLink('kanban', 'close', "kanbanID=$kanban->id", '', true), '<i class="icon icon-off"></i>' . $this->lang->kanban->close, '', "class='iframe btn btn-link'") . '</li>';
+            if(common::hasPriv('kanban', 'delete')) $kanbanActions .= '<li>' . html::a(helper::createLink('kanban', 'delete', "kanbanID=$kanban->id"), '<i class="icon icon-trash"></i>' . $this->lang->kanban->delete, 'hiddenwin', "class='btn btn-link'") . '</li>';
+            if($kanbanActions)
+            {
+                $actions .= common::hasPriv('kanban', 'createRegion') ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
+            }
+        }
 
         $actions .= "</ul>";
         $actions .= "</div>";
diff --git a/module/kanban/view/createcard.html.php b/module/kanban/view/createcard.html.php
index fbfad8b3ea..114420a693 100644
--- a/module/kanban/view/createcard.html.php
+++ b/module/kanban/view/createcard.html.php
@@ -38,9 +38,9 @@
           <th><?php echo $lang->kanbancard->beginAndEnd;?></th>
           <td colspan='2'>
             <div class='input-group'>
-              <?php echo html::input('begin', '', "class='form-control form-date form-datetime' placeholder='{$lang->kanbancard->begin}'");?>
+              <?php echo html::input('begin', '', "class='form-control form-date form-date' placeholder='{$lang->kanbancard->begin}'");?>
               <span class='input-group-addon fix-border'>~</span>
-              <?php echo html::input('end', '', "class='form-control form-date form-datetime' placeholder='{$lang->kanbancard->end}'");?>
+              <?php echo html::input('end', '', "class='form-control form-date form-date' placeholder='{$lang->kanbancard->end}'");?>
             </div>
           </td>
         </tr>
diff --git a/module/kanban/view/editcard.html.php b/module/kanban/view/editcard.html.php
index 76c18aa063..71c5f419f7 100644
--- a/module/kanban/view/editcard.html.php
+++ b/module/kanban/view/editcard.html.php
@@ -52,11 +52,11 @@
                 </tr>
                 <tr>
                   <th><?php echo $lang->kanbancard->begin;?></th>
-                  <td><?php echo html::input('begin', helper::isZeroDate($card->begin) ? '' : $card->begin, "class='form-control form-datetime'");?></td>
+                  <td><?php echo html::input('begin', helper::isZeroDate($card->begin) ? '' : $card->begin, "class='form-control form-date'");?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->kanbancard->end;?></th>
-                  <td><?php echo html::input('end', helper::isZeroDate($card->end) ? '' : $card->end, "class='form-control form-datetime'");?></td>
+                  <td><?php echo html::input('end', helper::isZeroDate($card->end) ? '' : $card->end, "class='form-control form-date'");?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->kanbancard->pri;?></th>