Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'

* Fix bug#20897,20907.

See merge request easycorp/zentaopms!2359

extension/lite/block/ext/view/welcome.html.php

@@ -30,15 +30,15 @@
       <div class="row tiles">
         <div class="col tile">
           <div class="tile-title"><?php echo $lang->block->undone?></div>
-          <div class="tile-amount"><?php echo empty($data) ? 0 : html::a($this->createLink('my', 'work', 'mode=task'), (int)$data['undone']);?></div>
+          <div class="tile-amount"><?php echo empty($data) ? 0 : html::a($this->createLink('my', 'contribute', 'mode=task&type=assignedTo'), (int)$data['undone']);?></div>
         </div>
         <div class="col tile">
           <div class="tile-title"><?php echo $lang->block->delaying?></div>
-          <div class="tile-amount"><?php echo empty($data) ? 0 : html::a($this->createLink('my', 'work', 'mode=task'), (int)$data['delaying']);?></div>
+          <div class="tile-amount"><?php echo empty($data) ? 0 : html::a($this->createLink('my', 'contribute', 'mode=task&type=assignedTo'), (int)$data['delaying']);?></div>
         </div>
         <div class="col tile">
           <div class="tile-title"><?php echo $lang->block->delayed?></div>
-          <div class="tile-amount"><?php echo empty($data) ? 0 : html::a($this->createLink('my', 'work', 'mode=task'), (int)$data['delayed']);?></div>
+          <div class="tile-amount"><?php echo empty($data) ? 0 : html::a($this->createLink('my', 'contribute', 'mode=task&type=assignedTo'), (int)$data['delayed']);?></div>
         </div>
       </div>
     </div>

extension/lite/kanban/ext/lang/en/lite.php

@@ -7,4 +7,5 @@ $lang->kanban->taskColumn['pause']      = 'Pause';
 $lang->kanban->taskColumn['canceled']   = 'Canceled';
 $lang->kanban->taskColumn['closed']     = 'Closed';
 
-$lang->kanban->common = 'Common Kanban';
+$lang->kanban->importCards = 'Enable the import function, you can only import cards that you have permission to view.';
+$lang->kanban->common = 'Common Kanban';

extension/lite/kanban/ext/lang/zh-cn/lite.php

@@ -7,4 +7,5 @@ $lang->kanban->taskColumn['pause']      = '已暂停';
 $lang->kanban->taskColumn['canceled']   = '已取消';
 $lang->kanban->taskColumn['closed']     = '已关闭';
 
-$lang->kanban->common = '通用看板';
+$lang->kanban->importCards = '启用导入功能，只能导入自己有权限查看的卡片';
+$lang->kanban->common = '通用看板';

extension/lite/kanban/ext/view/import.html.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * The import file of kanban module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Fangzhou Hu <hufangzhou@easycorp.ltd>
+ * @package     kanban
+ * @version     $Id: import.html.php 935 2022-01-19 14:15:24Z hufangzhou@easycorp.ltd $
+ * @link        https://www.zentao.net
+ */
+?>
+
+<?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
+<?php js::set('enableImport', $enableImport);?>
+<?php js::set('vision', $this->config->vision);?>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <?php echo "<span>" . $lang->kanban->import . '</span>';?>
+      </h2>
+    </div>
+    <form method='post' class="load-indicator main-form form-ajax" target='hiddenwin' id='importForm'>
+      <table align='center' class='table table-form'>
+        <tr>
+          <td colspan='2'>
+            <label class="radio-inline">
+              <input type='radio' name='import' value='off' <?php echo $enableImport == 'off' ? "checked='checked'" : ''; ?> id='importoff'/>
+              <?php echo $lang->kanban->importList['off'];?>
+            </label>
+          </td>
+        </tr>
+        <tr>
+          <td colspan='2'>
+            <label class="radio-inline">
+              <input type='radio' name='import' value='on' <?php echo $enableImport == 'on' ? "checked='checked'" : ''; ?> id='importon'/>
+              <?php echo $lang->kanban->importCards;?>
+              <input type='hidden' name='importObjectList[]' value='cards'/>
+            </label>
+          </td>
+        </tr>
+        <tr id='emptyTip' class='hidden'><td colspan='3' style='color: red;'><?php echo $lang->kanban->error->importObjNotEmpty;?></td></tr>
+        <tr>
+          <td class='form-actions'><?php echo html::submitButton();?></td>
+        </tr>
+      </table>
+    </form>
+  </div>
+</div>
+<?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>
+

module/kanban/css/view.css

@@ -19,6 +19,7 @@
 .region .region-header label {color: #999; background: transparent; border: 1px solid #ddd; margin-left: 10px; margin-right: 10px}
 .region .region-header .action {float: right}
 .region .region-header .icon-double-angle-up,.icon-double-angle-down {cursor: pointer;}
+.region .kanban-header-sub-cols {border-right: 2px solid #fff;margin-left:0;}
 .region .kanban-header-sub-cols .kanban-header-col > .title {max-width: 100% !important;min-width:240px;}
 .region .sort .region-header {cursor: move;}
 

module/kanban/js/import.js

@@ -24,7 +24,7 @@ $(function()
         var enableImport     = $("input:checked[name='import']").val();
         var objectListLength = $("input:checked[name^=importObjectList]").length;
 
-        if(enableImport == 'on' && objectListLength == 0)
+        if(enableImport == 'on' && objectListLength == 0 && vision != 'lite')
         {
             $('#emptyTip').removeClass('hidden');
             return false;

module/kanban/view/import.html.php

@@ -13,6 +13,7 @@
 
 <?php include '../../common/view/header.lite.html.php';?>
 <?php js::set('enableImport', $enableImport);?>
+<?php js::set('vision', $this->config->vision);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>